Merge remote-tracking branch 'upstream/master' into I_KEEP_MAKING_FEATURES_HELP

Conflicts:
	nano/assets/nanoui.css
	nano/styles/_lists.less

code/modules/client/preferences.dm

@@ -1135,7 +1135,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						ha_style = "None" // No Vulp ears on Unathi
 						m_style = "None" // No Unathi markings on Tajara
 
-						body_accessory = null //no vulpatail on humans damnit
+						body_accessory = null //no vulptail on humans damnit
 				if("speciesprefs")//oldvox code
 					speciesprefs = !speciesprefs
 

code/modules/clothing/shoes/miscellaneous.dm

@@ -57,6 +57,16 @@
 	put_on_delay = 50
 	species_restricted = null
 
+/obj/item/clothing/shoes/galoshes/dry
+	name = "absorbent galoshes"
+	desc = "A pair of purple rubber boots, designed to prevent slipping on wet surfaces while also drying them."
+	icon_state = "galoshes_dry"
+
+/obj/item/clothing/shoes/galoshes/dry/step_action()
+	var/turf/simulated/t_loc = get_turf(src)
+	if(istype(t_loc) && t_loc.wet)
+		t_loc.MakeDry(TURF_WET_WATER)
+
 /obj/item/clothing/shoes/clown_shoes
 	desc = "The prankster's standard-issue clowning shoes. Damn they're huge!"
 	name = "clown shoes"

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

@@ -100,7 +100,7 @@ var/global/list/body_accessory_by_species = list("None" = null)
 	return 0
 
 
-//vulpakin
+//Vulpkanin
 /datum/body_accessory/tail/vulpkanin_2
 	name = "Vulpkanin Alt 1 (Bushy)"
 

code/modules/mob/living/carbon/human/species/station.dm

@@ -111,7 +111,7 @@
 
 /datum/species/vulpkanin
 	name = "Vulpkanin"
-	name_plural = "Vulpakanin"
+	name_plural = "Vulpkanin"
 	icobase = 'icons/mob/human_races/r_vulpkanin.dmi'
 	deform = 'icons/mob/human_races/r_vulpkanin.dmi'
 	path = /mob/living/carbon/human/vulpkanin
@@ -173,6 +173,7 @@
 
 	default_language = "Galactic Common"
 	language = "Vox-pidgin"
+	tail = "voxtail"
 	speech_sounds = list('sound/voice/shriek1.ogg')
 	speech_chance = 20
 	unarmed_type = /datum/unarmed_attack/claws	//I dont think it will hurt to give vox claws too.
@@ -199,12 +200,16 @@
 	flags = NO_SCAN | IS_WHITELISTED
 	clothing_flags = HAS_SOCKS
 	dietflags = DIET_OMNI
+	bodyflags = HAS_TAIL | TAIL_WAGGING
 
 	blood_color = "#2299FC"
 	flesh_color = "#808D11"
 
 	reagent_tag = PROCESS_ORG
 
+/datum/species/vox/handle_death(var/mob/living/carbon/human/H)
+	H.stop_tail_wagging(1)
+
 /datum/species/vox/makeName(var/gender,var/mob/living/carbon/human/H=null)
 	var/sounds = rand(2,8)
 	var/i = 0

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

@@ -1,29 +1,29 @@
-/mob/living/carbon/slime/death(gibbed)
-	if(!gibbed)
-		if(is_adult)
-			var/mob/living/carbon/slime/M = new /mob/living/carbon/slime(loc)
-			M.colour = colour
-			M.rabid = 1
-			is_adult = 0
-			maxHealth = 150
-			revive()
-			regenerate_icons()
-			number = rand(1, 1000)
-			name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])"
-			return
-
-	if(stat == DEAD)	return
-	stat = DEAD
-	icon_state = "[colour] baby slime dead"
-	overlays.len = 0
-	for(var/mob/O in viewers(src, null))
-		O.show_message("<b>The [name]</b> seizes up and falls limp...", 1) //ded -- Urist
-
-	update_canmove()
-	if(blind)
-		blind.layer = 0
-
-	if(ticker && ticker.mode)
-		ticker.mode.check_win()
-
+/mob/living/carbon/slime/death(gibbed)
+	if(!gibbed)
+		if(is_adult)
+			var/mob/living/carbon/slime/M = new /mob/living/carbon/slime(loc)
+			M.colour = colour
+			M.rabid = 1
+			is_adult = 0
+			maxHealth = 150
+			revive()
+			regenerate_icons()
+			number = rand(1, 1000)
+			name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])"
+			return
+
+	if(stat == DEAD)	return
+	stat = DEAD
+	icon_state = "[colour] baby slime dead"
+	overlays.len = 0
+	for(var/mob/O in viewers(src, null))
+		O.show_message("<b>The [name]</b> seizes up and falls limp...", 1) //ded -- Urist
+
+	update_canmove()
+	if(blind)
+		blind.layer = 0
+
+	if(ticker && ticker.mode)
+		ticker.mode.check_win()
+
 	return ..(gibbed)

code/modules/mob/living/carbon/slime/emote.dm

@@ -1,74 +1,74 @@
-/mob/living/carbon/slime/emote(var/act, var/m_type=1, var/message = null)
-	if (findtext(act, "-", 1, null))
-		var/t1 = findtext(act, "-", 1, null)
-		//param = copytext(act, t1 + 1, length(act) + 1)
-		act = copytext(act, 1, t1)
-
-	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
-		act = copytext(act,1,length(act))
-
-	switch(act) //Alphabetical please
-		if ("me")
-			if(silent)
-				return
-			if (src.client)
-				if (client.prefs.muted & MUTE_IC)
-					src << "\red You cannot send IC messages (muted)."
-					return
-				if (src.client.handle_spam_prevention(message,MUTE_IC))
-					return
-				if (stat)
-					return
-				if(!(message))
-					return
-				return custom_emote(m_type, message)
-		if("bounce")
-			message = "<B>The [src.name]</B> bounces in place."
-			m_type = 1
-
-		if ("custom")
-			return custom_emote(m_type, message)
-
-		if("jiggle")
-			message = "<B>The [src.name]</B> jiggles!"
-			m_type = 1
-
-		if("light")
-			message = "<B>The [src.name]</B> lights up for a bit, then stops."
-			m_type = 1
-
-		if("moan")
-			message = "<B>The [src.name]</B> moans."
-			m_type = 2
-
-		if("shiver")
-			message = "<B>The [src.name]</B> shivers."
-			m_type = 2
-
-		if("sway")
-			message = "<B>The [src.name]</B> sways around dizzily."
-			m_type = 1
-
-		if("twitch")
-			message = "<B>The [src.name]</B> twitches."
-			m_type = 1
-
-		if("vibrate")
-			message = "<B>The [src.name]</B> vibrates!"
-			m_type = 1
-
-		if ("help") //This is an exception
-			src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate"
-
-		else
-			src << "\blue Unusable emote '[act]'. Say *help for a list."
-	if ((message && src.stat == 0))
-		if (m_type & 1)
-			for(var/mob/O in viewers(src, null))
-				O.show_message(message, m_type)
-				//Foreach goto(703)
-		else
-			for(var/mob/O in hearers(src, null))
-				O.show_message(message, m_type)
-				//Foreach goto(746)
+/mob/living/carbon/slime/emote(var/act, var/m_type=1, var/message = null)
+	if (findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		//param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+
+	switch(act) //Alphabetical please
+		if ("me")
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+				if (stat)
+					return
+				if(!(message))
+					return
+				return custom_emote(m_type, message)
+		if("bounce")
+			message = "<B>The [src.name]</B> bounces in place."
+			m_type = 1
+
+		if ("custom")
+			return custom_emote(m_type, message)
+
+		if("jiggle")
+			message = "<B>The [src.name]</B> jiggles!"
+			m_type = 1
+
+		if("light")
+			message = "<B>The [src.name]</B> lights up for a bit, then stops."
+			m_type = 1
+
+		if("moan")
+			message = "<B>The [src.name]</B> moans."
+			m_type = 2
+
+		if("shiver")
+			message = "<B>The [src.name]</B> shivers."
+			m_type = 2
+
+		if("sway")
+			message = "<B>The [src.name]</B> sways around dizzily."
+			m_type = 1
+
+		if("twitch")
+			message = "<B>The [src.name]</B> twitches."
+			m_type = 1
+
+		if("vibrate")
+			message = "<B>The [src.name]</B> vibrates!"
+			m_type = 1
+
+		if ("help") //This is an exception
+			src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate"
+
+		else
+			src << "\blue Unusable emote '[act]'. Say *help for a list."
+	if ((message && src.stat == 0))
+		if (m_type & 1)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(703)
+		else
+			for(var/mob/O in hearers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(746)
 	return

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

@@ -1,44 +1,44 @@
-/mob/living/carbon/slime/examine(mob/user)
-	..(user)
-	var/msg = ""
-	if (src.stat == DEAD)
-		msg += "<span class='deadsay'>It is limp and unresponsive.</span>\n"
-	else
-		if (src.getBruteLoss())
-			msg += "<span class='warning'>"
-			if (src.getBruteLoss() < 40)
-				msg += "It has some punctures in its flesh!"
-			else
-				msg += "<B>It has severe punctures and tears in its flesh!</B>"
-			msg += "</span>\n"
-
-		switch(powerlevel)
-
-			if(2 to 3)
-				msg += "It is flickering gently with a little electrical activity.\n"
-
-			if(4 to 5)
-				msg += "It is glowing gently with moderate levels of electrical activity.\n"
-
-			if(6 to 9)
-				msg += "<span class='warning'>It is glowing brightly with high levels of electrical activity.</span>\n"
-
-			if(10)
-				msg += "<span class='warning'><B>It is radiating with massive levels of electrical activity!</B></span>\n"
-
-	msg += "<span class='warning'>"
-	switch(wetlevel)
-		if(1)
-			msg += "It looks a bit damp.\n"
-		if(2)
-			msg += "It looks a little bit wet.\n"
-		if(3)
-			msg += "It looks wet.\n"
-		if(4)
-			msg += "It looks very wet.\n"
-		if(5)
-			msg += "It looks absolutely soaked.\n"
-	msg += "</span>"
-
-	msg += "*---------*</span>"
+/mob/living/carbon/slime/examine(mob/user)
+	..(user)
+	var/msg = ""
+	if (src.stat == DEAD)
+		msg += "<span class='deadsay'>It is limp and unresponsive.</span>\n"
+	else
+		if (src.getBruteLoss())
+			msg += "<span class='warning'>"
+			if (src.getBruteLoss() < 40)
+				msg += "It has some punctures in its flesh!"
+			else
+				msg += "<B>It has severe punctures and tears in its flesh!</B>"
+			msg += "</span>\n"
+
+		switch(powerlevel)
+
+			if(2 to 3)
+				msg += "It is flickering gently with a little electrical activity.\n"
+
+			if(4 to 5)
+				msg += "It is glowing gently with moderate levels of electrical activity.\n"
+
+			if(6 to 9)
+				msg += "<span class='warning'>It is glowing brightly with high levels of electrical activity.</span>\n"
+
+			if(10)
+				msg += "<span class='warning'><B>It is radiating with massive levels of electrical activity!</B></span>\n"
+
+	msg += "<span class='warning'>"
+	switch(wetlevel)
+		if(1)
+			msg += "It looks a bit damp.\n"
+		if(2)
+			msg += "It looks a little bit wet.\n"
+		if(3)
+			msg += "It looks wet.\n"
+		if(4)
+			msg += "It looks very wet.\n"
+		if(5)
+			msg += "It looks absolutely soaked.\n"
+	msg += "</span>"
+
+	msg += "*---------*</span>"
 	user << msg

code/modules/mob/living/carbon/slime/login.dm

@@ -1,4 +1,4 @@
-/mob/living/carbon/slime/Login()
-	..()
-	update_hud()
-	return
+/mob/living/carbon/slime/Login()
+	..()
+	update_hud()
+	return

code/modules/mob/living/carbon/slime/powers.dm

@@ -1,228 +1,228 @@
-/mob/living/carbon/slime/verb/Feed()
-	set category = "Slime"
-	set desc = "This will let you feed on any valid creature in the surrounding area. This should also be used to halt the feeding process."
-	if(Victim)
-		Feedstop()
-		return
-
-	if(stat)
-		src << "<i>I must be conscious to do this...</i>"
-		return
-
-	var/list/choices = list()
-	for(var/mob/living/C in view(1,src))
-		if(C!=src && !istype(C,/mob/living/carbon/slime) && Adjacent(C))
-			choices += C
-
-	var/mob/living/M = input(src,"Who do you wish to feed on?") in null|choices
-	if(!M) return
-	if(Adjacent(M))
-
-		if(!istype(src, /mob/living/carbon/brain))
-			if(!istype(M, /mob/living/carbon/slime))
-				if(stat != 2)
-					if(health > -70)
-
-						for(var/mob/living/carbon/slime/met in view())
-							if(met.Victim == M && met != src)
-								src << "<i>The [met.name] is already feeding on this subject...</i>"
-								return
-						src << "\blue <i>I have latched onto the subject and begun feeding...</i>"
-						M << "\red <b>The [src.name] has latched onto your head!</b>"
-						Feedon(M)
-
-					else
-						src << "<i>This subject does not have a strong enough life energy...</i>"
-				else
-					src << "<i>This subject does not have an edible life energy...</i>"
-			else
-				src << "<i>I must not feed on my brothers...</i>"
-		else
-			src << "<i>This subject does not have an edible life energy...</i>"
-
-
-
-/mob/living/carbon/slime/proc/Feedon(var/mob/living/M)
-	Victim = M
-	src.loc = M.loc
-	canmove = 0
-	anchored = 1
-	var/lastnut = nutrition
-	var/fed_succesfully = 0
-	if(is_adult)
-		icon_state = "[colour] adult slime eat"
-	else
-		icon_state = "[colour] baby slime eat"
-
-	while(Victim && M.health > -70 && M.stat != DEAD && stat != DEAD)
-		canmove = 0
-
-		if(Adjacent(M))
-			loc = M.loc
-
-			if(prob(15) && M.client && istype(M, /mob/living/carbon))
-				M << "<span class='danger'>[pick("You can feel your body becoming weak!", \
-				"You feel like you're about to die!", \
-				"You feel every part of your body screaming in agony!", \
-				"A low, rolling pain passes through your body!", \
-				"Your body feels as if it's falling apart!", \
-				"You feel extremely weak!", \
-				"A sharp, deep pain bathes every inch of your body!")]</span>"
-
-			if(istype(M, /mob/living/carbon))
-				Victim.adjustCloneLoss(rand(5,6))
-				Victim.adjustToxLoss(rand(1,2))
-				if(Victim.health <= 0)
-					Victim.adjustToxLoss(rand(2,4))
-
-				fed_succesfully = 1
-
-			else if(istype(M, /mob/living/simple_animal))
-				Victim.adjustBruteLoss(is_adult ? rand(7, 15) : rand(4, 12))
-				fed_succesfully = 1
-
-			else
-				if(prob(25))
-					src << "<span class='warning'>[pick("This subject is incompatable", \
-					"This subject does not have a life energy", "This subject is empty", \
-					"I am not satisified", "I can not feed from this subject", \
-					"I do not feel nourished", "This subject is not food")]...</span>"
-
-			if(fed_succesfully)
-				//I have no idea why this is not in handle_nutrition()
-				nutrition += rand(15,30)
-				if(nutrition >= lastnut + 50)
-					if(prob(80))
-						lastnut = nutrition
-						powerlevel++
-						if(powerlevel > 10)
-							powerlevel = 10
-							adjustToxLoss(-10)
-
-				//Heal yourself.
-				adjustOxyLoss(-10)
-				adjustBruteLoss(-10)
-				adjustFireLoss(-10)
-				adjustCloneLoss(-10)
-
-				updatehealth()
-				if(Victim)
-					Victim.updatehealth()
-
-			sleep(rand(15,45))
-
-		else
-			break
-
-	if(stat == 2)
-		if(!is_adult)
-			icon_state = "[colour] baby slime dead"
-
-	else
-		if(is_adult)
-			icon_state = "[colour] adult slime"
-		else
-			icon_state = "[colour] baby slime"
-
-	canmove = 1
-	anchored = 0
-
-	if(M)
-		if(M.health <= -70)
-			M.canmove = 0
-			if(!client)
-				if(Victim && !rabid && !attacked)
-					if(Victim.LAssailant && Victim.LAssailant != Victim)
-						if(prob(50))
-							if(!(Victim.LAssailant in Friends))
-								Friends[Victim.LAssailant] = 1
-								//Friends.Add(Victim.LAssailant) // no idea why i was using the |= operator
-							else
-								++Friends[Victim.LAssailant]
-
-
-			if(M.client && istype(src, /mob/living/carbon/human))
-				if(prob(85))
-					rabid = 1 // UUUNNBGHHHH GONNA EAT JUUUUUU
-
-			if(client) src << "<i>This subject does not have a strong enough life energy anymore...</i>"
-		else
-			M.canmove = 1
-
-			if(client) src << "<i>I have stopped feeding...</i>"
-	else
-		if(client) src << "<i>I have stopped feeding...</i>"
-
-	Victim = null
-
-/mob/living/carbon/slime/proc/Feedstop()
-	if(Victim)
-		if(Victim.client) Victim << "[src] has let go of your head!"
-		Victim = null
-
-/mob/living/carbon/slime/proc/UpdateFeed(var/mob/M)
-	if(Victim)
-		if(Victim == M)
-			loc = M.loc // simple "attach to head" effect!
-
-
-/mob/living/carbon/slime/verb/Evolve()
-	set category = "Slime"
-	set desc = "This will let you evolve from baby to adult slime."
-
-	if(stat)
-		src << "<i>I must be conscious to do this...</i>"
-		return
-	if(!is_adult)
-		if(amount_grown >= 10)
-			is_adult = 1
-			maxHealth = 200
-			amount_grown = 0
-			regenerate_icons()
-			name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])")
-		else
-			src << "<i>I am not ready to evolve yet...</i>"
-	else
-		src << "<i>I have already evolved...</i>"
-
-/mob/living/carbon/slime/verb/Reproduce()
-	set category = "Slime"
-	set desc = "This will make you split into four Slimes."
-
-	if(stat)
-		src << "<i>I must be conscious to do this...</i>"
-		return
-
-	if(is_adult)
-		if(amount_grown >= 10)
-			if(stat)
-				src << "<i>I must be conscious to do this...</i>"
-				return
-
-			var/list/babies = list()
-			var/new_nutrition = round(nutrition * 0.9)
-			var/new_powerlevel = round(powerlevel / 4)
-			for(var/i=1,i<=4,i++)
-				var/mob/living/carbon/slime/M = new /mob/living/carbon/slime/(loc)
-				if(prob(mutation_chance))
-					M.colour = slime_mutation[rand(1,4)]
-				else
-					M.colour = colour
-				if(ckey)	M.nutrition = new_nutrition //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature!
-				M.powerlevel = new_powerlevel
-				if(i != 1) step_away(M,src)
-				M.Friends = Friends.Copy()
-				babies += M
-				feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]")
-
-			var/mob/living/carbon/slime/new_slime = pick(babies)
-			new_slime.universal_speak = universal_speak
-			if(src.mind)
-				src.mind.transfer_to(new_slime)
-			else
-				new_slime.key = src.key
-			qdel(src)
-		else
-			src << "<i>I am not ready to reproduce yet...</i>"
-	else
+/mob/living/carbon/slime/verb/Feed()
+	set category = "Slime"
+	set desc = "This will let you feed on any valid creature in the surrounding area. This should also be used to halt the feeding process."
+	if(Victim)
+		Feedstop()
+		return
+
+	if(stat)
+		src << "<i>I must be conscious to do this...</i>"
+		return
+
+	var/list/choices = list()
+	for(var/mob/living/C in view(1,src))
+		if(C!=src && !istype(C,/mob/living/carbon/slime) && Adjacent(C))
+			choices += C
+
+	var/mob/living/M = input(src,"Who do you wish to feed on?") in null|choices
+	if(!M) return
+	if(Adjacent(M))
+
+		if(!istype(src, /mob/living/carbon/brain))
+			if(!istype(M, /mob/living/carbon/slime))
+				if(stat != 2)
+					if(health > -70)
+
+						for(var/mob/living/carbon/slime/met in view())
+							if(met.Victim == M && met != src)
+								src << "<i>The [met.name] is already feeding on this subject...</i>"
+								return
+						src << "\blue <i>I have latched onto the subject and begun feeding...</i>"
+						M << "\red <b>The [src.name] has latched onto your head!</b>"
+						Feedon(M)
+
+					else
+						src << "<i>This subject does not have a strong enough life energy...</i>"
+				else
+					src << "<i>This subject does not have an edible life energy...</i>"
+			else
+				src << "<i>I must not feed on my brothers...</i>"
+		else
+			src << "<i>This subject does not have an edible life energy...</i>"
+
+
+
+/mob/living/carbon/slime/proc/Feedon(var/mob/living/M)
+	Victim = M
+	src.loc = M.loc
+	canmove = 0
+	anchored = 1
+	var/lastnut = nutrition
+	var/fed_succesfully = 0
+	if(is_adult)
+		icon_state = "[colour] adult slime eat"
+	else
+		icon_state = "[colour] baby slime eat"
+
+	while(Victim && M.health > -70 && M.stat != DEAD && stat != DEAD)
+		canmove = 0
+
+		if(Adjacent(M))
+			loc = M.loc
+
+			if(prob(15) && M.client && istype(M, /mob/living/carbon))
+				M << "<span class='danger'>[pick("You can feel your body becoming weak!", \
+				"You feel like you're about to die!", \
+				"You feel every part of your body screaming in agony!", \
+				"A low, rolling pain passes through your body!", \
+				"Your body feels as if it's falling apart!", \
+				"You feel extremely weak!", \
+				"A sharp, deep pain bathes every inch of your body!")]</span>"
+
+			if(istype(M, /mob/living/carbon))
+				Victim.adjustCloneLoss(rand(5,6))
+				Victim.adjustToxLoss(rand(1,2))
+				if(Victim.health <= 0)
+					Victim.adjustToxLoss(rand(2,4))
+
+				fed_succesfully = 1
+
+			else if(istype(M, /mob/living/simple_animal))
+				Victim.adjustBruteLoss(is_adult ? rand(7, 15) : rand(4, 12))
+				fed_succesfully = 1
+
+			else
+				if(prob(25))
+					src << "<span class='warning'>[pick("This subject is incompatable", \
+					"This subject does not have a life energy", "This subject is empty", \
+					"I am not satisified", "I can not feed from this subject", \
+					"I do not feel nourished", "This subject is not food")]...</span>"
+
+			if(fed_succesfully)
+				//I have no idea why this is not in handle_nutrition()
+				nutrition += rand(15,30)
+				if(nutrition >= lastnut + 50)
+					if(prob(80))
+						lastnut = nutrition
+						powerlevel++
+						if(powerlevel > 10)
+							powerlevel = 10
+							adjustToxLoss(-10)
+
+				//Heal yourself.
+				adjustOxyLoss(-10)
+				adjustBruteLoss(-10)
+				adjustFireLoss(-10)
+				adjustCloneLoss(-10)
+
+				updatehealth()
+				if(Victim)
+					Victim.updatehealth()
+
+			sleep(rand(15,45))
+
+		else
+			break
+
+	if(stat == 2)
+		if(!is_adult)
+			icon_state = "[colour] baby slime dead"
+
+	else
+		if(is_adult)
+			icon_state = "[colour] adult slime"
+		else
+			icon_state = "[colour] baby slime"
+
+	canmove = 1
+	anchored = 0
+
+	if(M)
+		if(M.health <= -70)
+			M.canmove = 0
+			if(!client)
+				if(Victim && !rabid && !attacked)
+					if(Victim.LAssailant && Victim.LAssailant != Victim)
+						if(prob(50))
+							if(!(Victim.LAssailant in Friends))
+								Friends[Victim.LAssailant] = 1
+								//Friends.Add(Victim.LAssailant) // no idea why i was using the |= operator
+							else
+								++Friends[Victim.LAssailant]
+
+
+			if(M.client && istype(src, /mob/living/carbon/human))
+				if(prob(85))
+					rabid = 1 // UUUNNBGHHHH GONNA EAT JUUUUUU
+
+			if(client) src << "<i>This subject does not have a strong enough life energy anymore...</i>"
+		else
+			M.canmove = 1
+
+			if(client) src << "<i>I have stopped feeding...</i>"
+	else
+		if(client) src << "<i>I have stopped feeding...</i>"
+
+	Victim = null
+
+/mob/living/carbon/slime/proc/Feedstop()
+	if(Victim)
+		if(Victim.client) Victim << "[src] has let go of your head!"
+		Victim = null
+
+/mob/living/carbon/slime/proc/UpdateFeed(var/mob/M)
+	if(Victim)
+		if(Victim == M)
+			loc = M.loc // simple "attach to head" effect!
+
+
+/mob/living/carbon/slime/verb/Evolve()
+	set category = "Slime"
+	set desc = "This will let you evolve from baby to adult slime."
+
+	if(stat)
+		src << "<i>I must be conscious to do this...</i>"
+		return
+	if(!is_adult)
+		if(amount_grown >= 10)
+			is_adult = 1
+			maxHealth = 200
+			amount_grown = 0
+			regenerate_icons()
+			name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])")
+		else
+			src << "<i>I am not ready to evolve yet...</i>"
+	else
+		src << "<i>I have already evolved...</i>"
+
+/mob/living/carbon/slime/verb/Reproduce()
+	set category = "Slime"
+	set desc = "This will make you split into four Slimes."
+
+	if(stat)
+		src << "<i>I must be conscious to do this...</i>"
+		return
+
+	if(is_adult)
+		if(amount_grown >= 10)
+			if(stat)
+				src << "<i>I must be conscious to do this...</i>"
+				return
+
+			var/list/babies = list()
+			var/new_nutrition = round(nutrition * 0.9)
+			var/new_powerlevel = round(powerlevel / 4)
+			for(var/i=1,i<=4,i++)
+				var/mob/living/carbon/slime/M = new /mob/living/carbon/slime/(loc)
+				if(prob(mutation_chance))
+					M.colour = slime_mutation[rand(1,4)]
+				else
+					M.colour = colour
+				if(ckey)	M.nutrition = new_nutrition //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature!
+				M.powerlevel = new_powerlevel
+				if(i != 1) step_away(M,src)
+				M.Friends = Friends.Copy()
+				babies += M
+				feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]")
+
+			var/mob/living/carbon/slime/new_slime = pick(babies)
+			new_slime.universal_speak = universal_speak
+			if(src.mind)
+				src.mind.transfer_to(new_slime)
+			else
+				new_slime.key = src.key
+			qdel(src)
+		else
+			src << "<i>I am not ready to reproduce yet...</i>"
+	else
 		src << "<i>I am not old enough to reproduce yet...</i>"

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

@@ -1,79 +1,79 @@
-proc/mutation_table(var/colour)
-	var/list/slime_mutation[4]
-	switch(colour)
-		//Tier 1
-		if("grey")
-			slime_mutation[1] = "orange"
-			slime_mutation[2] = "metal"
-			slime_mutation[3] = "blue"
-			slime_mutation[4] = "purple"
-		//Tier 2
-		if("purple")
-			slime_mutation[1] = "dark purple"
-			slime_mutation[2] = "dark blue"
-			slime_mutation[3] = "green"
-			slime_mutation[4] = "green"
-		if("metal")
-			slime_mutation[1] = "silver"
-			slime_mutation[2] = "yellow"
-			slime_mutation[3] = "gold"
-			slime_mutation[4] = "gold"
-		if("orange")
-			slime_mutation[1] = "dark purple"
-			slime_mutation[2] = "yellow"
-			slime_mutation[3] = "red"
-			slime_mutation[4] = "red"
-		if("blue")
-			slime_mutation[1] = "dark blue"
-			slime_mutation[2] = "silver"
-			slime_mutation[3] = "pink"
-			slime_mutation[4] = "pink"
-		//Tier 3
-		if("dark blue")
-			slime_mutation[1] = "purple"
-			slime_mutation[2] = "blue"
-			slime_mutation[3] = "cerulean"
-			slime_mutation[4] = "cerulean"
-		if("dark purple")
-			slime_mutation[1] = "purple"
-			slime_mutation[2] = "orange"
-			slime_mutation[3] = "sepia"
-			slime_mutation[4] = "sepia"
-		if("yellow")
-			slime_mutation[1] = "metal"
-			slime_mutation[2] = "orange"
-			slime_mutation[3] = "bluespace"
-			slime_mutation[4] = "bluespace"
-		if("silver")
-			slime_mutation[1] = "metal"
-			slime_mutation[2] = "blue"
-			slime_mutation[3] = "pyrite"
-			slime_mutation[4] = "pyrite"
-		//Tier 4
-		if("pink")
-			slime_mutation[1] = "pink"
-			slime_mutation[2] = "pink"
-			slime_mutation[3] = "light pink"
-			slime_mutation[4] = "light pink"
-		if("red")
-			slime_mutation[1] = "red"
-			slime_mutation[2] = "red"
-			slime_mutation[3] = "oil"
-			slime_mutation[4] = "oil"
-		if("gold")
-			slime_mutation[1] = "gold"
-			slime_mutation[2] = "gold"
-			slime_mutation[3] = "adamantine"
-			slime_mutation[4] = "adamantine"
-		if("green")
-			slime_mutation[1] = "green"
-			slime_mutation[2] = "green"
-			slime_mutation[3] = "black"
-			slime_mutation[4] = "black"
-		// Tier 5
-		else
-			slime_mutation[1] = colour
-			slime_mutation[2] = colour
-			slime_mutation[3] = colour
-			slime_mutation[4] = colour
+proc/mutation_table(var/colour)
+	var/list/slime_mutation[4]
+	switch(colour)
+		//Tier 1
+		if("grey")
+			slime_mutation[1] = "orange"
+			slime_mutation[2] = "metal"
+			slime_mutation[3] = "blue"
+			slime_mutation[4] = "purple"
+		//Tier 2
+		if("purple")
+			slime_mutation[1] = "dark purple"
+			slime_mutation[2] = "dark blue"
+			slime_mutation[3] = "green"
+			slime_mutation[4] = "green"
+		if("metal")
+			slime_mutation[1] = "silver"
+			slime_mutation[2] = "yellow"
+			slime_mutation[3] = "gold"
+			slime_mutation[4] = "gold"
+		if("orange")
+			slime_mutation[1] = "dark purple"
+			slime_mutation[2] = "yellow"
+			slime_mutation[3] = "red"
+			slime_mutation[4] = "red"
+		if("blue")
+			slime_mutation[1] = "dark blue"
+			slime_mutation[2] = "silver"
+			slime_mutation[3] = "pink"
+			slime_mutation[4] = "pink"
+		//Tier 3
+		if("dark blue")
+			slime_mutation[1] = "purple"
+			slime_mutation[2] = "blue"
+			slime_mutation[3] = "cerulean"
+			slime_mutation[4] = "cerulean"
+		if("dark purple")
+			slime_mutation[1] = "purple"
+			slime_mutation[2] = "orange"
+			slime_mutation[3] = "sepia"
+			slime_mutation[4] = "sepia"
+		if("yellow")
+			slime_mutation[1] = "metal"
+			slime_mutation[2] = "orange"
+			slime_mutation[3] = "bluespace"
+			slime_mutation[4] = "bluespace"
+		if("silver")
+			slime_mutation[1] = "metal"
+			slime_mutation[2] = "blue"
+			slime_mutation[3] = "pyrite"
+			slime_mutation[4] = "pyrite"
+		//Tier 4
+		if("pink")
+			slime_mutation[1] = "pink"
+			slime_mutation[2] = "pink"
+			slime_mutation[3] = "light pink"
+			slime_mutation[4] = "light pink"
+		if("red")
+			slime_mutation[1] = "red"
+			slime_mutation[2] = "red"
+			slime_mutation[3] = "oil"
+			slime_mutation[4] = "oil"
+		if("gold")
+			slime_mutation[1] = "gold"
+			slime_mutation[2] = "gold"
+			slime_mutation[3] = "adamantine"
+			slime_mutation[4] = "adamantine"
+		if("green")
+			slime_mutation[1] = "green"
+			slime_mutation[2] = "green"
+			slime_mutation[3] = "black"
+			slime_mutation[4] = "black"
+		// Tier 5
+		else
+			slime_mutation[1] = colour
+			slime_mutation[2] = colour
+			slime_mutation[3] = colour
+			slime_mutation[4] = colour
 	return(slime_mutation)

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

@@ -1 +1 @@
-//no special icon processing
+//no special icon processing

code/modules/mob/mob_movement.dm

@@ -236,7 +236,9 @@
 			src << "\blue You're pinned to a wall by [mob.pinned[1]]!"
 			return 0
 
+		var/turf/T = mob.loc
 		move_delay = world.time//set move delay
+		move_delay += T.slowdown
 		mob.last_movement = world.time
 		mob.last_move_intent = world.time + 10
 		switch(mob.m_intent)
@@ -265,7 +267,6 @@
 					var/mob/M = L[1]
 					if(M)
 						if ((get_dist(mob, M) <= 1 || M.loc == mob.loc))
-							var/turf/T = mob.loc
 							. = ..()
 							if (isturf(M.loc))
 								var/diag = get_dir(mob, M)

code/modules/mob/new_player/sprite_accessories.dm

@@ -937,6 +937,12 @@
 		species_allowed = list("Vulpkanin")
 		gender = NEUTER
 
+	vulp_vulpine_fluff
+		name = "Vulpine and Earfluff"
+		icon_state = "vulp_facial_vulpine_fluff"
+		species_allowed = list("Vulpkanin")
+		gender = NEUTER
+
 	vulp_mask
 		name = "Mask"
 		icon_state = "vulp_facial_mask"
@@ -1589,6 +1595,12 @@
 	icon_state = "vulp_facial_vulpine"
 	species_allowed = list("Vulpkanin")
 
+/datum/sprite_accessory/head_accessory/vulp_vulpine_fluff
+	icon = 'icons/mob/human_face.dmi'
+	name = "Vulpine and Earfluff"
+	icon_state = "vulp_facial_vulpine_fluff"
+	species_allowed = list("Vulpkanin")
+
 /datum/sprite_accessory/head_accessory/vulp_mask
 	icon = 'icons/mob/human_face.dmi'
 	name = "Mask"

code/modules/paperwork/paper.dm

@@ -563,11 +563,11 @@
 
 /obj/item/weapon/paper/blueshield
 	name = "paper- 'Blueshield Mission Briefing'"
-	info = "<b>Blueshield Mission Briefing</b><br>You are charged with the defence of any persons of importance within the station. This includes but is not limited to The Captain, The Heads of Staff and Central Command staff. You answer directly to the Head of Security who will assist you in achieving your mission.<br>Where required to achieve your primary responsibility you should liaise with security and share resources, however the day to day security operations of the station are outside of your jurisdiction.<br>Monitor the health and safety of your principals, identify any potential risks and threats then alert the proper departments to resolve the situation. You are authorized to act as bodyguard to any of the station heads that you determine are most in need of protection, however additional access to their departments shall be granted solely at their discretion.<br>Observe the station alert system and carry your armaments only as required by the situation or when authorized by the Head of Security or Captain in exceptional cases.<br>Remember, as an agent of Nanotrasen it is your responsibility to conduct yourself appropriately and you will be held to the highest standard. You will be held accountable for your actions. Security is authorized to search, interrogate or detain you as required by their own procedures. Internal affairs will also monitor and observe your conduct and their mandate applies equally to security and Blueshield operations."
+	info = "<b>Blueshield Mission Briefing</b><br>You are charged with the defence of any persons of importance within the station. This includes, but is not limited to, The Captain, The Heads of Staff and Central Command staff. You answer directly to the Nanotrasen Representative who will assist you in achieving your mission.<br>When required to achieve your primary responsibility, you should liaise with security and share resources; however, the day to day security operations of the station are outside of your jurisdiction.<br>Monitor the health and safety of your principals, identify any potential risks and threats, then alert the proper departments to resolve the situation. You are authorized to act as bodyguard to any of the station heads that you determine are most in need of protection; however, additional access to their departments shall be granted solely at their discretion.<br>Observe the station alert system and carry your armaments only as required by the situation, or when authorized by the Head of Security or Captain in exceptional cases.<br>Remember, as an agent of Nanotrasen it is your responsibility to conduct yourself appropriately and you will be held to the highest standard. You will be held accountable for your actions. Security is authorized to search, interrogate or detain you as required by their own procedures. Internal affairs will also monitor and observe your conduct, and their mandate applies equally to security and Blueshield operations."
 
 /obj/item/weapon/paper/ntrep
 	name = "paper- 'Nanotrasen Representative Mission Briefing'"
-	info = "<b>Nanotrasen Representative Mission Briefing</b><br><br>Nanotrasen Central Command has dispatched you to this station in order to liaise with command staff on their behalf. As experienced field officers, the staff on the station are experts in handling their own fields. It is your job however to consider the bigger picture and to direct the staff towards Nanotrasen's corporate interests.<br>As a civilian, you should consider yourself an advisor, diplomat and intermediary. The command staff do not answer to you directly and are not required to follow your orders nor do you have disciplinary authority over personnel. In all station internal matters you answer to the Head of Personnel who will direct you in your conduct within the station. However you also answer to Central Command who may, as required, direct you in acting on company interests.<br>Central Command may dispatch orders to the staff through you which you are responsible to communicate, however enforcement of these orders is not your mandate and will be handled directly by Central Command or authorized Nanotrasen personnel. When not specifically directed by Central Command, assist the head of personnel in evaluation of the station and receiving departmental reports.<br>Your office has been provided with a direct link to Central Command, through which you can issue any urgent reports or requests for Nanotrasen intervention. Remember that any direct intervention is a costly exercise and should be used only when the situation justifies the request. You will be held accountable for any unnecessary usage of Nanotrasen resources.<br>"
+	info = "<b>Nanotrasen Representative Mission Briefing</b><br><br>Nanotrasen Central Command has dispatched you to this station in order to liaise with command staff on their behalf. As experienced field officers, the staff on the station are experts in handling their own fields. It is your job, however, to consider the bigger picture and to direct the staff towards Nanotrasen's corporate interests.<br>As a civilian, you should consider yourself an advisor, diplomat and intermediary. The command staff do not answer to you directly and are not required to follow your orders, nor do you have disciplinary authority over personnel. In all station internal matters you answer to the Head of Personnel who will direct you in your conduct within the station. However, you also answer to Central Command who may, as required, direct you in acting on company interests.<br>Central Command may dispatch orders to the staff through you which you are responsible to communicate; however, enforcement of these orders is not your mandate and will be handled directly by Central Command or authorized Nanotrasen personnel. When not specifically directed by Central Command, assist the Head of Personnel in evaluation of the station and receiving departmental reports.<br>Your office has been provided with a direct link to Central Command, through which you can issue any urgent reports or requests for Nanotrasen intervention. Remember that any direct intervention is a costly exercise and should be used only when the situation justifies the request. You will be held accountable for any unnecessary usage of Nanotrasen resources.<br>"
 
 /obj/item/weapon/paper/armory
 	name = "paper- 'Armory Inventory'"

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -28,17 +28,37 @@
 /obj/item/ammo_casing/c9mmap
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type =/obj/item/projectile/bullet/armourpiercing
+	projectile_type = "/obj/item/projectile/bullet/armourpiercing"
 
 /obj/item/ammo_casing/c9mmtox
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = /obj/item/projectile/bullet/toxinbullet
+	projectile_type = "/obj/item/projectile/bullet/toxinbullet"
 
 /obj/item/ammo_casing/c9mminc
 	desc = "A 9mm bullet casing."
 	caliber = "9mm"
-	projectile_type = /obj/item/projectile/bullet/incendiary/firebullet
+	projectile_type = "/obj/item/projectile/bullet/incendiary/firebullet"
+
+/obj/item/ammo_casing/c46x30mm
+	desc = "A 4.6x30mm bullet casing."
+	caliber = "4.6x30mm"
+	projectile_type = "/obj/item/projectile/bullet/weakbullet3"
+
+/obj/item/ammo_casing/c46x30mmap
+	desc = "A 4.6x30mm bullet casing."
+	caliber = "4.6x30mm"
+	projectile_type = "/obj/item/projectile/bullet/armourpiercing"
+
+/obj/item/ammo_casing/c46x30mmtox
+	desc = "A 4.6x30mm bullet casing."
+	caliber = "4.6x30mm"
+	projectile_type = "/obj/item/projectile/bullet/toxinbullet"
+
+/obj/item/ammo_casing/c46x30mminc
+	desc = "A 4.6x30mm bullet casing."
+	caliber = "4.6x30mm"
+	projectile_type = "/obj/item/projectile/bullet/incendiary/firebullet"
 
 /obj/item/ammo_casing/c45
 	desc = "A .45 bullet casing."
@@ -60,7 +80,7 @@
 	desc = "A 12 gauge buckshot shell."
 	icon_state = "gshell"
 	projectile_type = "/obj/item/projectile/bullet/pellet"
-	pellets = 5
+	pellets = 6
 	deviation = 30
 
 /obj/item/ammo_casing/shotgun/rubbershot
@@ -68,7 +88,7 @@
 	desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
 	icon_state = "bshell"
 	projectile_type = "/obj/item/projectile/bullet/rpellet"
-	pellets = 5
+	pellets = 6
 	deviation = 30
 	materials = list(MAT_METAL=4000)
 
@@ -94,7 +114,7 @@
 	desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
 	propellant. It's like playing russian roulette, with a shotgun."
 	icon_state = "improvshell"
-	projectile_type = /obj/item/projectile/bullet/pellet/random
+	projectile_type = "/obj/item/projectile/bullet/pellet/random"
 	materials = list(MAT_METAL=250)
 	pellets = 5
 	deviation = 30
@@ -135,7 +155,7 @@
 	name = "FRAG-12 slug"
 	desc = "A high explosive breaching round for a 12 gauge shotgun."
 	icon_state = "heshell"
-	projectile_type = /obj/item/projectile/bullet/frag12
+	projectile_type = "/obj/item/projectile/bullet/frag12"
 
 /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
 	name = "dragonsbreath shell"
@@ -150,7 +170,7 @@
 	desc = "An advanced shotgun shell which uses a subspace ansible crystal to produce an effect similar to a standard ion rifle. \
 	The unique properties of the crystal splot the pulse into a spread of individually weaker bolts."
 	icon_state = "ionshell"
-	projectile_type = /obj/item/projectile/ion/weak
+	projectile_type = "/obj/item/projectile/ion/weak"
 	pellets = 4
 	deviation = 30
 
@@ -158,7 +178,7 @@
 	name = "laser slug"
 	desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a laser weapon in a ballistic package."
 	icon_state = "lshell"
-	projectile_type = /obj/item/projectile/beam
+	projectile_type = "/obj/item/projectile/beam"
 
 /obj/item/ammo_casing/shotgun/techshell
 	name = "unloaded technological shell"

code/modules/projectiles/ammunition/magazines.dm

@@ -49,7 +49,7 @@
 	desc = "Oh god, this shouldn't be here"
 	ammo_type = "/obj/item/ammo_casing/shotgun/buckshot"
 	caliber = "shotgun"
-	max_ammo = 8
+	max_ammo = 6
 	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/cylinder/dualshot
@@ -116,10 +116,33 @@
 	..()
 	icon_state = "[initial(icon_state)]-[ammo_count() ? "8" : "0"]"
 
+/obj/item/ammo_box/magazine/wt550m9
+	name = "wt550 magazine (4.6x30mm)"
+	icon_state = "46x30mmt-20"
+	ammo_type = "/obj/item/ammo_casing/c46x30mm"
+	caliber = "4.6x30mm"
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/wt550m9/update_icon()
+	..()
+	icon_state = "46x30mmt-[round(ammo_count(),4)]"
+
+/obj/item/ammo_box/magazine/wt550m9/wtap
+	name = "wt550 magazine (Armour Piercing 4.6x30mm)"
+	ammo_type = "/obj/item/ammo_casing/c46x30mmap"
+
+/obj/item/ammo_box/magazine/wt550m9/wttx
+	name = "wt550 magazine (Toxin Tipped 4.6x30mm)"
+	ammo_type = "/obj/item/ammo_casing/c46x30mmtox"
+
+/obj/item/ammo_box/magazine/wt550m9/wtic
+	name = "wt550 magazine (Incindiary 4.6x30mm)"
+	ammo_type = "/obj/item/ammo_casing/c46x30mminc"
+
 /obj/item/ammo_box/magazine/uzim9mm
 	name = "uzi magazine (9mm)"
 	icon_state = "uzi9mm-32"
-	ammo_type = /obj/item/ammo_casing/c9mm
+	ammo_type = "/obj/item/ammo_casing/c9mm"
 	caliber = "9mm"
 	max_ammo = 32
 
@@ -137,17 +160,17 @@
 
 /obj/item/ammo_box/magazine/smgm9mm/ap
 	name = "SMG magazine (Armour Piercing 9mm)"
-	ammo_type = /obj/item/ammo_casing/c9mmap
+	ammo_type = "/obj/item/ammo_casing/c9mmap"
 	materials = list(MAT_METAL = 3000)
 
 /obj/item/ammo_box/magazine/smgm9mm/toxin
 	name = "SMG magazine (Toxin Tipped 9mm)"
-	ammo_type = /obj/item/ammo_casing/c9mmtox
+	ammo_type = "/obj/item/ammo_casing/c9mmtox"
 	materials = list(MAT_METAL = 3000)
 
 /obj/item/ammo_box/magazine/smgm9mm/fire
 	name = "SMG Magazine (Incendiary 9mm)"
-	ammo_type = /obj/item/ammo_casing/c9mminc
+	ammo_type = "/obj/item/ammo_casing/c9mminc"
 	materials = list(MAT_METAL = 3000)
 
 /obj/item/ammo_box/magazine/smgm9mm/update_icon()
@@ -194,7 +217,7 @@
 	name = "toploader magazine (5.56mm)"
 	icon_state = "5.56m"
 	origin_tech = "combat=5;syndicate=1"
-	ammo_type = /obj/item/ammo_casing/a556
+	ammo_type = "/obj/item/ammo_casing/a556"
 	caliber = "a556"
 	max_ammo = 30
 	multiple_sprites = 2

code/modules/projectiles/guns/projectile/automatic.dm

@@ -6,11 +6,11 @@
 	can_suppress = 1
 	burst_size = 3
 	fire_delay = 2
-	action_button_name = "Toggle Firemode"	
-	
+	action_button_name = "Toggle Firemode"
+
 /obj/item/weapon/gun/projectile/automatic/isHandgun()
 	return 0
-	
+
 /obj/item/weapon/gun/projectile/automatic/proto
 	name = "\improper Nanotrasen Saber SMG"
 	desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
@@ -49,10 +49,10 @@
 			A.update_icon()
 			update_icon()
 			return 1
-	
+
 /obj/item/weapon/gun/projectile/automatic/ui_action_click()
 	burst_select()
-	
+
 /obj/item/weapon/gun/projectile/automatic/verb/burst_select()
 	var/mob/living/carbon/human/user = usr
 	select = !select
@@ -102,14 +102,30 @@
 	icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][silenced ? "-suppressed" : ""]"
 	return
 
+/obj/item/weapon/gun/projectile/automatic/wt550
+	name = "security auto rifle"
+	desc = "An outdated personal defense weapon utilized by law enforcement. The WT-550 Automatic Rifle fires 4.6x30mm rounds."
+	icon_state = "wt550"
+	item_state = "arg"
+	mag_type = "/obj/item/ammo_box/magazine/wt550m9"
+	fire_delay = 2
+	can_suppress = 0
+	burst_size = 1
+	action_button_name = null
+
+/obj/item/weapon/gun/projectile/automatic/wt550/update_icon()
+	..()
+	icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
+	return
+
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
 	name = "\improper 'Type U3' Uzi"
 	desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
 	icon_state = "mini-uzi"
 	origin_tech = "combat=5;materials=2;syndicate=8"
 	mag_type = "/obj/item/ammo_box/magazine/uzim9mm"
-	burst_size = 2	
-	
+	burst_size = 2
+
 /obj/item/weapon/gun/projectile/automatic/l6_saw
 	name = "\improper L6 SAW"
 	desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
@@ -125,7 +141,7 @@
 	can_suppress = 0
 	burst_size = 5
 	fire_delay = 3
-	
+
 /obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
 	cover_open = !cover_open
 	user << "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>"
@@ -190,7 +206,7 @@
 		..()
 		empty_alarm()
 		return
-		
+
 /obj/item/weapon/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user, params)
 	if(istype(A, /obj/item/ammo_casing))
 		if(istype(A, text2path(underbarrel.magazine.ammo_type)))
@@ -258,4 +274,3 @@
 	can_suppress = 0
 	burst_size = 3
 	fire_delay = 1
-	

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -74,16 +74,6 @@
 	if (chambered)
 		user << "A [chambered.BB ? "live" : "spent"] one is in the chamber."
 
-// COMBAT SHOTGUN //
-
-/obj/item/weapon/gun/projectile/shotgun/combat
-	name = "combat shotgun"
-	desc = "A traditional shotgun with tactical furniture and an eight-shell capacity underneath."
-	icon_state = "cshotgun"
-	origin_tech = "combat=5;materials=2"
-	mag_type = "/obj/item/ammo_box/magazine/internal/shotcom"
-	w_class = 5
-
 // RIOT SHOTGUN //
 
 /obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory
@@ -237,7 +227,7 @@
 		return
 	else
 		sawn_state = SAWN_INTACT
-	
+
 /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
 	name = "\improper 'Bulldog' Shotgun"
 	desc = "A compact, mag-fed semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
@@ -273,3 +263,17 @@
 	..()
 	empty_alarm()
 	return
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/Fire(mob/living/user as mob|obj)
+	..()
+	pump(user)
+
+// COMBAT SHOTGUN //
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/combat
+	name = "combat shotgun"
+	desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
+	icon_state = "cshotgun"
+	origin_tech = "combat=5;materials=2"
+	mag_type = "/obj/item/ammo_box/magazine/internal/shotcom"
+	w_class = 5

code/modules/reagents/Chemistry-Machinery.dm

@@ -14,7 +14,7 @@
 	var/energy = 100
 	var/max_energy = 100
 	var/amount = 30
-	var/beaker = null
+	var/obj/item/weapon/reagent_containers/beaker = null
 	var/recharged = 0
 	var/hackedcheck = 0
 	var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
@@ -123,15 +123,15 @@
 
 	var beakerContents[0]
 	var beakerCurrentVolume = 0
-	if(beaker && beaker:reagents && beaker:reagents.reagent_list.len)
-		for(var/datum/reagent/R in beaker:reagents.reagent_list)
+	if(beaker && beaker.reagents && beaker.reagents.reagent_list.len)
+		for(var/datum/reagent/R in beaker.reagents.reagent_list)
 			beakerContents.Add(list(list("name" = R.name, "id"=R.id, "volume" = R.volume))) // list in a list because Byond merges the first list...
 			beakerCurrentVolume += R.volume
 	data["beakerContents"] = beakerContents
 
 	if (beaker)
 		data["beakerCurrentVolume"] = beakerCurrentVolume
-		data["beakerMaxVolume"] = beaker:volume
+		data["beakerMaxVolume"] = beaker.volume
 	else
 		data["beakerCurrentVolume"] = null
 		data["beakerMaxVolume"] = null
@@ -385,7 +385,7 @@
 	icon_state = "mixer0"
 	use_power = 1
 	idle_power_usage = 20
-	var/beaker = null
+	var/obj/item/weapon/reagent_containers/beaker = null
 	var/obj/item/weapon/storage/pill_bottle/loaded_pill_bottle = null
 	var/mode = 0
 	var/condi = 0
@@ -483,7 +483,7 @@
 			P.info += "<b>Time of analysis:</b> [worldtime2text(world.time)]<br><br>"
 			P.info += "<b>Chemical name:</b> [href_list["name"]]<br>"
 			if(href_list["name"] == "Blood")
-				var/datum/reagents/R = beaker:reagents
+				var/datum/reagents/R = beaker.reagents
 				var/datum/reagent/blood/G
 				for(var/datum/reagent/F in R.reagent_list)
 					if(F.name == href_list["name"])
@@ -499,7 +499,7 @@
 			src.printing = null
 
 	if(beaker)
-		var/datum/reagents/R = beaker:reagents
+		var/datum/reagents/R = beaker.reagents
 		if (href_list["analyze"])
 			var/dat = ""
 			if(!condi)
@@ -562,7 +562,7 @@
 			return
 		else if (href_list["eject"])
 			if(beaker)
-				beaker:loc = src.loc
+				beaker.forceMove(get_turf(src))
 				beaker = null
 				reagents.clear_reagents()
 				icon_state = "mixer0"
@@ -695,7 +695,7 @@
 			dat += "No pill bottle inserted.<BR><BR>"
 		dat += "<A href='?src=\ref[src];close=1'>Close</A>"
 	else
-		var/datum/reagents/R = beaker:reagents
+		var/datum/reagents/R = beaker.reagents
 		dat += "<A href='?src=\ref[src];eject=1'>Eject beaker and Clear Buffer</A><BR>"
 		if(src.loaded_pill_bottle)
 			dat += "<A href='?src=\ref[src];ejectp=1'>Eject Pill Bottle \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.storage_slots]\]</A><BR><BR>"
@@ -759,6 +759,44 @@
 	name = "\improper CondiMaster 3000"
 	condi = 1
 
+/obj/machinery/chem_master/constructable
+	name = "ChemMaster 2999"
+	desc = "Used to seperate chemicals and distribute them in a variety of forms."
+
+/obj/machinery/chem_master/constructable/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/chem_master(null)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null)
+
+/obj/machinery/chem_master/constructable/attackby(obj/item/B, mob/user, params)
+
+	if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", B))
+		if(beaker)
+			beaker.forceMove(get_turf(src))
+			beaker = null
+			reagents.clear_reagents()
+		if(loaded_pill_bottle)
+			loaded_pill_bottle.forceMove(get_turf(src))
+			loaded_pill_bottle = null
+		return
+
+	if(exchange_parts(user, B))
+		return
+
+	if(panel_open)
+		if(istype(B, /obj/item/weapon/crowbar))
+			default_deconstruction_crowbar(B)
+			return 1
+		else
+			user << "<span class='warning'>You can't use the [src.name] while it's panel is opened!</span>"
+			return 1
+	else
+		..()
+
 /obj/machinery/reagentgrinder
 
 	name = "\improper All-In-One Grinder"

code/modules/reagents/newchem/medicine.dm

@@ -1016,12 +1016,8 @@ datum/reagent/haloperidol/on_mob_life(var/mob/living/M as mob)
 	if (!istype(T)) return
 	src = null
 	if(volume >= 1)
-		if(T.wet >= 2)			//Clears lube! Fight back against the slipping, and WIN!
-			T.wet = 0
-			if(T.wet_overlay)
-				T.overlays -= T.wet_overlay
-				T.wet_overlay = null
-			return
+		if(istype(T) && T.wet)
+			T.MakeDry(TURF_WET_LUBE)
 
 /datum/reagent/degreaser/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom

code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm

@@ -196,4 +196,11 @@
 		result = "lsd"
 		required_reagents = list("diethylamine" = 1, "fungus" = 1)
 		result_amount = 3
-		mix_message = "The mixture turns a rather unassuming color and settles."
+		mix_message = "The mixture turns a rather unassuming color and settles."
+
+	drying_agent
+		name = "Drying agent"
+		id = "drying_agent"
+		result = "drying_agent"
+		required_reagents = list("plasma" = 2, "ethanol" = 1, "sodium" = 1)
+		result_amount = 3

code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm

@@ -450,11 +450,25 @@
 			Z.loc = get_turf(holder.my_atom)
 			Z.announce_to_ghosts()
 //Bluespace
+	slimefloor2
+		name = "Bluespace Floor"
+		id = "m_floor2"
+		result = null
+		required_reagents = list("blood" = 1)
+		result_amount = 1
+		required_container = /obj/item/slime_extract/bluespace
+		required_other = 1
+		on_reaction(datum/reagents/holder, created_volume)
+			feedback_add_details("slime_cores_used","[type]")
+			var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace
+			P.amount = 25
+			P.loc = get_turf(holder.my_atom)
+
 	slimecrystal
 		name = "Slime Crystal"
 		id = "m_crystal"
 		result = null
-		required_reagents = list("blood" = 1)
+		required_reagents = list("plasma" = 1)
 		result_amount = 1
 		required_container = /obj/item/slime_extract/bluespace
 		required_other = 1
@@ -489,20 +503,23 @@
 			feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
 			var/obj/item/device/camera/P = new /obj/item/device/camera
 			P.loc = get_turf(holder.my_atom)
+			var/obj/item/device/camera_film/Z = new /obj/item/device/camera_film
+			Z.loc = get_turf(holder.my_atom)
 
-
-	slimefilm
-		name = "Slime Film"
-		id = "m_film"
+	slimefloor
+		name = "Sepia Floor"
+		id = "m_floor"
 		result = null
 		required_reagents = list("blood" = 1)
 		result_amount = 1
 		required_container = /obj/item/slime_extract/sepia
 		required_other = 1
-		on_reaction(var/datum/reagents/holder)
-			feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-			var/obj/item/device/camera_film/P = new /obj/item/device/camera_film
+		on_reaction(datum/reagents/holder)
+			feedback_add_details("slime_cores_used","[type]")
+			var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia
+			P.amount = 25
 			P.loc = get_turf(holder.my_atom)
+
 //Pyrite
 	slimepaint
 		name = "Slime Paint"

code/modules/reagents/oldchem/reagents/reagents_food.dm

@@ -281,21 +281,7 @@
 	if (!istype(T)) return
 	src = null
 	if(volume >= 3)
-		if(T.wet >= 1) return
-		T.wet = 1
-		if(T.wet_overlay)
-			T.overlays -= T.wet_overlay
-			T.wet_overlay = null
-		T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
-		T.overlays += T.wet_overlay
-
-		spawn(800)
-			if (!istype(T)) return
-			if(T.wet >= 2) return
-			T.wet = 0
-			if(T.wet_overlay)
-				T.overlays -= T.wet_overlay
-				T.wet_overlay = null
+		T.MakeSlippery()
 	var/hotspot = (locate(/obj/effect/hotspot) in T)
 	if(hotspot)
 		var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )

code/modules/reagents/oldchem/reagents/reagents_water.dm

@@ -31,21 +31,7 @@
 	if (!istype(T)) return
 	src = null
 	if(volume >= 3)
-		if(T.wet >= 1) return
-		T.wet = 1
-		if(T.wet_overlay)
-			T.overlays -= T.wet_overlay
-			T.wet_overlay = null
-		T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
-		T.overlays += T.wet_overlay
-
-		spawn(800)
-			if (!istype(T)) return
-			if(T.wet >= 2) return
-			T.wet = 0
-			if(T.wet_overlay)
-				T.overlays -= T.wet_overlay
-				T.wet_overlay = null
+		T.MakeSlippery()
 
 	for(var/mob/living/carbon/slime/M in T)
 		M.apply_water()
@@ -91,15 +77,7 @@
 	if (!istype(T)) return
 	src = null
 	if(volume >= 1)
-		if(T.wet >= 2) return
-		T.wet = 2
-		spawn(800)
-			if (!istype(T)) return
-			T.wet = 0
-			if(T.wet_overlay)
-				T.overlays -= T.wet_overlay
-				T.wet_overlay = null
-			return
+		T.MakeSlippery(TURF_WET_LUBE)
 
 
 /datum/reagent/space_cleaner
@@ -122,7 +100,6 @@
 	if(volume >= 1)
 		if(T)
 			T.color = initial(T.color)
-		T.overlays.Cut()
 		T.clean_blood()
 		for(var/obj/effect/decal/cleanable/C in src)
 			qdel(C)
@@ -350,6 +327,23 @@
 	reagent_state = LIQUID
 	color = "#FFFFD6" // very very light yellow
 
+/datum/reagent/drying_agent
+	name = "Drying agent"
+	id = "drying_agent"
+	description = "Can be used to dry things."
+	reagent_state = LIQUID
+	color = "#A70FFF"
+
+/datum/reagent/drying_agent/reaction_turf(turf/simulated/T, reac_volume)
+	if(istype(T) && T.wet)
+		T.MakeDry(TURF_WET_WATER)
+
+/datum/reagent/drying_agent/reaction_obj(obj/O, reac_volume)
+	if(istype(O, /obj/item/clothing/shoes/galoshes))
+		var/t_loc = get_turf(O)
+		qdel(O)
+		new /obj/item/clothing/shoes/galoshes/dry(t_loc)
+
 /*
 /datum/reagent/vaccine
 	//data must contain virus type

code/modules/research/designs/machine_designs.dm

@@ -152,6 +152,16 @@
 	build_path = /obj/item/weapon/circuitboard/chem_dispenser
 	category = list("Medical Machinery")
 
+/datum/design/chem_master
+	name = "Machine Design (Chem Master Board)"
+	desc = "The circuit board for a Chem Master 2999."
+	id = "chem_master"
+	req_tech = list("biotech" = 1, "materials" = 2, "programming" = 2)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000, "sacid" = 20)
+	build_path = /obj/item/weapon/circuitboard/chem_master
+	category = list("Medical Machinery")
+
 /datum/design/chem_heater
 	name = "Machine Design (Chemical Heater Board)"
 	desc = "The circuit board for a chemical heater."

code/modules/research/designs/weapon_designs.dm

@@ -167,6 +167,39 @@
 	materials = list(MAT_METAL = 3000, MAT_GLASS = 200, MAT_URANIUM = 1000)
 	build_path = /obj/item/ammo_box/magazine/smgm9mm/toxin
 
+//WT550 Mags
+
+/datum/design/mag_oldsmg
+	name = "WT-550 Auto Gun Magazine (4.6×30mm)"
+	desc = "A 20 round magazine for the out of date security WT-550 Auto Rifle"
+	id = "mag_oldsmg"
+	req_tech = list("combat" = 1, "materials" = 1)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 4000)
+	build_path = /obj/item/ammo_box/magazine/wt550m9
+	category = list("Weapons")
+
+/datum/design/mag_oldsmg/ap_mag
+	name = "WT-550 Auto Gun Armour Piercing Magazine (4.6×30mm AP)"
+	desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle"
+	id = "mag_oldsmg_ap"
+	materials = list(MAT_METAL = 6000, MAT_SILVER = 600)
+	build_path = /obj/item/ammo_box/magazine/wt550m9/wtap
+
+/datum/design/mag_oldsmg/ic_mag
+	name = "WT-550 Auto Gun Incendiary Magazine (4.6×30mm IC)"
+	desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle"
+	id = "mag_oldsmg_ic"
+	materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000)
+	build_path = /obj/item/ammo_box/magazine/wt550m9/wtic
+
+/datum/design/mag_oldsmg/tx_mag
+	name = "WT-550 Auto Gun Urnaium Magazine (4.6×30mm TX)"
+	desc = "A 20 round urnaium tipped magazine for the out of date security WT-550 Auto Rifle"
+	id = "mag_oldsmg_tx"
+	materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000)
+	build_path = /obj/item/ammo_box/magazine/wt550m9/wttx
+
 /datum/design/rapidsyringe
 	name = "Rapid Syringe Gun"
 	desc = "A gun that fires many syringes."

code/modules/research/xenobiology/xenobiology.dm

@@ -0,0 +1,474 @@
+
+/// Slime Extracts ///
+
+/obj/item/slime_extract
+	name = "slime extract"
+	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
+	icon = 'icons/mob/slimes.dmi'
+	icon_state = "grey slime extract"
+	force = 1.0
+	w_class = 1.0
+	throwforce = 0
+	throw_speed = 3
+	throw_range = 6
+	origin_tech = "biotech=4"
+	item_color = "grey"
+	var/Uses = 1 // uses before it goes inert
+	var/enhanced = 0 //has it been enhanced before?
+
+	attackby(obj/item/O as obj, mob/user as mob, params)
+		if(istype(O, /obj/item/weapon/slimesteroid2))
+			if(enhanced == 1)
+				user << "<span class='warning'> This extract has already been enhanced!</span>"
+				return ..()
+			if(Uses == 0)
+				user << "<span class='warning'> You can't enhance a used extract!</span>"
+				return ..()
+			user <<"You apply the enhancer. It now has triple the amount of uses."
+			Uses = 3
+			enhanced = 1
+			qdel(O)
+		if(istype(O,/obj/item/weapon/storage/bag))
+			..()
+
+/obj/item/slime_extract/New()
+		..()
+		create_reagents(100)
+
+
+/obj/item/slime_extract/grey
+	name = "grey slime extract"
+	icon_state = "grey slime extract"
+	item_color = "grey"
+
+/obj/item/slime_extract/gold
+	name = "gold slime extract"
+	icon_state = "gold slime extract"
+	item_color = "gold"
+
+/obj/item/slime_extract/silver
+	name = "silver slime extract"
+	icon_state = "silver slime extract"
+	item_color = "silver"
+
+/obj/item/slime_extract/metal
+	name = "metal slime extract"
+	icon_state = "metal slime extract"
+	item_color = "metal"
+
+/obj/item/slime_extract/purple
+	name = "purple slime extract"
+	icon_state = "purple slime extract"
+	item_color = "purple"
+
+/obj/item/slime_extract/darkpurple
+	name = "dark purple slime extract"
+	icon_state = "dark purple slime extract"
+	item_color = "darkpurple"
+
+/obj/item/slime_extract/orange
+	name = "orange slime extract"
+	icon_state = "orange slime extract"
+	item_color = "orange"
+
+/obj/item/slime_extract/yellow
+	name = "yellow slime extract"
+	icon_state = "yellow slime extract"
+	item_color = "yellow"
+
+/obj/item/slime_extract/red
+	name = "red slime extract"
+	icon_state = "red slime extract"
+	item_color = "red"
+
+/obj/item/slime_extract/blue
+	name = "blue slime extract"
+	icon_state = "blue slime extract"
+	item_color = "blue"
+
+/obj/item/slime_extract/darkblue
+	name = "dark blue slime extract"
+	icon_state = "dark blue slime extract"
+	item_color = "darkblue"
+
+/obj/item/slime_extract/pink
+	name = "pink slime extract"
+	icon_state = "pink slime extract"
+	item_color = "pink"
+
+/obj/item/slime_extract/green
+	name = "green slime extract"
+	icon_state = "green slime extract"
+	item_color = "green"
+
+/obj/item/slime_extract/lightpink
+	name = "light pink slime extract"
+	icon_state = "light pink slime extract"
+	item_color = "lightpink"
+
+/obj/item/slime_extract/black
+	name = "black slime extract"
+	icon_state = "black slime extract"
+	item_color = "black"
+
+/obj/item/slime_extract/oil
+	name = "oil slime extract"
+	icon_state = "oil slime extract"
+	item_color = "oil"
+
+/obj/item/slime_extract/adamantine
+	name = "adamantine slime extract"
+	icon_state = "adamantine slime extract"
+	item_color = "adamantine"
+
+/obj/item/slime_extract/bluespace
+	name = "bluespace slime extract"
+	icon_state = "bluespace slime extract"
+
+/obj/item/slime_extract/pyrite
+	name = "pyrite slime extract"
+	icon_state = "pyrite slime extract"
+
+/obj/item/slime_extract/cerulean
+	name = "cerulean slime extract"
+	icon_state = "cerulean slime extract"
+
+/obj/item/slime_extract/sepia
+	name = "sepia slime extract"
+	icon_state = "sepia slime extract"
+
+/obj/item/slime_extract/rainbow
+	name = "rainbow slime extract"
+	icon_state = "rainbow slime extract"
+
+////Pet Slime Creation///
+
+/obj/item/weapon/slimepotion
+	name = "docility potion"
+	desc = "A potent chemical mix that will nullify a slime's powers, causing it to become docile and tame."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle19"
+	w_class = 1
+	origin_tech = "biotech=4"
+
+	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 << "<span class='warning'> The potion only works on slimes!</span>"
+			return ..()
+		if(M.stat)
+			user << "<span class='warning'> The slime is dead!</span>"
+			return..()
+		if(M.mind)
+			user << "<span class='warning'> The slime resists!</span>"
+			return ..()
+		if(M.is_adult)
+			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]"
+			qdel(M)
+			var/newname = sanitize(copytext(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
+			qdel(src)
+		else
+			var/mob/living/simple_animal/slime/pet = new /mob/living/simple_animal/slime(M.loc)
+			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]"
+			qdel(M)
+			var/newname = sanitize(copytext(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
+			qdel(src)
+		user <<"You feed the slime the potion, removing it's powers and calming it."
+
+/obj/item/weapon/sentience_potion
+	name = "sentience potion"
+	desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels. Unlike normal slime potions, it can be absorbed by any nonsentient being."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle19"
+	origin_tech = "biotech=5"
+	var/list/not_interested = list()
+	var/being_used = 0
+	w_class = 1
+
+
+/obj/item/weapon/sentience_potion/afterattack(mob/living/M, mob/user)
+	if(being_used || !ismob(M))
+		return
+	if(!isslime(M) && !isanimal(M) || M.ckey) //only works on animals that aren't player controlled
+		user << "<span class='warning'>[M] is already too intelligent for this to work!</span>"
+		return ..()
+	if(M.stat)
+		user << "<span class='warning'>[M] is dead!</span>"
+		return..()
+
+	user << "<span class='notice'>You offer the sentience potion to [M]...</span>"
+	being_used = 1
+
+	var/list/candidates = get_candidates(ROLE_SENTIENT, ALIEN_AFK_BRACKET)
+
+	shuffle(candidates)
+
+	var/time_passed = world.time
+	var/list/consenting_candidates = list()
+
+	for(var/candidate in candidates)
+
+		if(candidate in not_interested)
+			continue
+
+		spawn(0)
+			switch(alert(candidate, "Would you like to play as [M.name]? Please choose quickly!","Confirmation","Yes","No"))
+				if("Yes")
+					if((world.time-time_passed)>=50 || !src)
+						return
+					consenting_candidates += candidate
+				if("No")
+					if(!src)
+						return
+					not_interested += candidate
+
+	sleep(50)
+
+	if(!src)
+		return
+
+	listclearnulls(consenting_candidates) //some candidates might have left during sleep(50)
+
+	if(consenting_candidates.len)
+		var/client/C = null
+		C = pick(consenting_candidates)
+		M.key = C.key
+		M.universal_speak = 1
+		M.faction |= "sentient"
+		M << "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>"
+		M << "<span class='userdanger'>You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.</span>"
+		user << "<span class='notice'>[M] accepts the potion and suddenly becomes attentive and aware. It worked!</span>"
+		if(isanimal(M))
+			var/mob/living/simple_animal/S = M
+			S.master_commander = user
+		qdel(src)
+	else
+		user << "<span class='notice'>[M] looks interested for a moment, but then looks back down. Maybe you should try again later.</span>"
+		being_used = 0
+		..()
+
+
+/obj/item/weapon/slimesteroid
+	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"
+	w_class = 1
+	origin_tech = "biotech=4"
+
+
+	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 << "<span class='warning'> The steroid only works on baby slimes!</span>"
+			return ..()
+		if(M.is_adult) //Can't tame adults
+			user << "<span class='warning'> Only baby slimes can use the steroid!</span>"
+			return..()
+		if(M.stat)
+			user << "<span class='warning'> The slime is dead!</span>"
+			return..()
+		if(M.cores == 3)
+			user <<"<span class='warning'> The slime already has the maximum amount of extract!</span>"
+			return..()
+
+		user <<"You feed the slime the steroid. It now has triple the amount of extract."
+		M.cores = 3
+		qdel(src)
+
+/obj/item/weapon/slimesteroid2
+	name = "extract enhancer"
+	desc = "A potent chemical mix that will give a slime extract three uses."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle17"
+	w_class = 1
+	origin_tech = "biotech=4"
+
+
+/obj/item/weapon/slimespeed
+	name = "slime speed potion"
+	desc = "A potent chemical mix that will remove the slowdown from any item."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle3"
+	w_class = 1
+	origin_tech = "biotech=4"
+
+/obj/item/weapon/slimespeed/afterattack(obj/item/C, mob/user)
+	..()
+	if(!istype(C))
+		user << "<span class='warning'>The potion can only be used on items!</span>"
+		return
+	if(C.slowdown <= 0)
+		user << "<span class='warning'>The [C] can't be made any faster!</span>"
+		return..()
+	user <<"<span class='notice'>You slather the red gunk over the [C], making it faster.</span>"
+	C.color = "#FF0000"
+	C.slowdown = 0
+	qdel(src)
+
+/obj/item/weapon/slimefireproof
+	name = "slime chill potion"
+	desc = "A potent chemical mix that will fireproof any article of clothing. Has three uses."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle17"
+	var/uses = 3
+	w_class = 1
+	origin_tech = "biotech=4"
+
+
+/obj/item/weapon/slimefireproof/afterattack(obj/item/clothing/C, mob/user)
+	..()
+	if(!uses)
+		qdel(src)
+		return
+	if(!istype(C))
+		user << "<span class='warning'>The potion can only be used on clothing!</span>"
+		return
+	if(C.max_heat_protection_temperature == FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
+		user << "<span class='warning'>The [C] is already fireproof!</span>"
+		return..()
+	user <<"<span class='notice'>You slather the blue gunk over the [C], fireproofing it.</span>"
+	C.name = "fireproofed [C.name]"
+	C.color = "#000080"
+	C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+	C.heat_protection = C.body_parts_covered
+	uses --
+	if(!uses)
+		qdel(src)
+
+/obj/item/stack/tile/bluespace
+	name = "bluespace floor tile"
+	singular_name = "floor tile"
+	desc = "Through a series of micro-teleports, these tiles let people move at incredible speeds."
+	icon_state = "tile-bluespace"
+	w_class = 3
+	force = 6
+	materials = list(MAT_METAL=500)
+	throwforce = 10
+	throw_speed = 3
+	throw_range = 7
+	flags = CONDUCT
+	max_amount = 60
+	turf_type = /turf/simulated/floor/bluespace
+
+
+/turf/simulated/floor/bluespace
+	slowdown = -1
+	icon_state = "bluespace"
+	desc = "Through a series of micro-teleports, these tiles let people move at incredible speeds."
+	floor_tile = /obj/item/stack/tile/bluespace
+
+
+/obj/item/stack/tile/sepia
+	name = "sepia floor tile"
+	singular_name = "floor tile"
+	desc = "Time seems to flow very slowly around these tiles."
+	icon_state = "tile-sepia"
+	w_class = 3
+	force = 6
+	materials = list(MAT_METAL=500)
+	throwforce = 10
+	throw_speed = 3
+	throw_range = 7
+	flags = CONDUCT
+	max_amount = 60
+	turf_type = /turf/simulated/floor/sepia
+
+
+/turf/simulated/floor/sepia
+	slowdown = 2
+	icon_state = "sepia"
+	desc = "Time seems to flow very slowly around these tiles."
+	floor_tile = /obj/item/stack/tile/sepia
+
+/obj/effect/goleRUNe
+	anchored = 1
+	desc = "a strange rune used to create golems. It glows when spirits are nearby."
+	name = "rune"
+	icon = 'icons/obj/rune.dmi'
+	icon_state = "golem"
+	unacidable = 1
+	layer = TURF_LAYER
+	var/list/mob/dead/observer/ghosts[0]
+
+	New()
+		..()
+		processing_objects.Add(src)
+
+	process()
+		if(ghosts.len>0)
+			icon_state = "golem2"
+		else
+			icon_state = "golem"
+
+	attack_hand(mob/living/user as mob)
+		var/mob/dead/observer/ghost
+		for(var/mob/dead/observer/O in src.loc)
+			if(!check_observer(O))
+				O << "\red You are not eligible to become a golem."
+				continue
+			ghost = O
+			break
+		if(!ghost)
+			user << "The rune fizzles uselessly. There is no spirit nearby."
+			return
+		var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem
+		if(prob(50))	G.gender = "female"
+		G.loc = src.loc
+		G.key = ghost.key
+		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 [user], and assist them in completing their goals at any cost."
+		qdel(src)
+
+
+	proc/announce_to_ghosts()
+		for(var/mob/dead/observer/O in player_list)
+			if(O.client)
+				var/area/A = get_area(src)
+				if(A)
+					O << "\blue <b>Golem rune created in [A.name]. (<a href='?src=\ref[O];jump=\ref[src]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</b>"
+
+	Topic(href,href_list)
+		if("signup" in href_list)
+			var/mob/dead/observer/O = locate(href_list["signup"])
+			volunteer(O)
+
+	attack_ghost(var/mob/dead/observer/O)
+		if(!O) return
+		volunteer(O)
+
+	proc/check_observer(var/mob/dead/observer/O)
+		if(!O)
+			return 0
+		if(!O.client)
+			return 0
+		if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
+			return 0
+		if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+			return 0
+		return 1
+
+	proc/volunteer(var/mob/dead/observer/O)
+		if(O in ghosts)
+			ghosts.Remove(O)
+			O << "\red You are no longer signed up to be a golem."
+		else
+			if(!check_observer(O))
+				O << "\red You are not eligible to become a golem."
+				return
+			ghosts.Add(O)
+			O << "\blue You are signed up to be a golem."

code/modules/virus2/effect.dm

@@ -556,19 +556,8 @@
 
 			if(istype(mob.loc,/turf/simulated))
 				var/turf/simulated/T = mob.loc
-				if(T.wet < 1)
-					T.wet = 1
-					if(T.wet_overlay)
-						T.overlays -= T.wet_overlay
-						T.wet_overlay = null
-					T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
-					T.overlays += T.wet_overlay
-					spawn(800)
-						if (istype(T) && T.wet < 2)
-							T.wet = 0
-							if(T.wet_overlay)
-								T.overlays -= T.wet_overlay
-								T.wet_overlay = null
+				if(T.wet < TURF_WET_WATER)
+					T.MakeSlippery()