Merge remote-tracking branch 'upstream/master' into goonchem-reagent-temperature

code/modules/client/client procs.dm

@@ -290,6 +290,10 @@
 		return null
 	if(byond_version < MIN_CLIENT_VERSION) // Too out of date to play at all. Unfortunately, we can't send them a message here.
 		return null
+	if(byond_build < config.minimum_client_build)
+		alert(src, "You are using a byond build which is not supported by this server. Please use a build version of atleast [config.minimum_client_build].", "Incorrect build", "OK")
+		del(src)
+		return
 	if(byond_version < SUGGESTED_CLIENT_VERSION) // Update is suggested, but not required.
 		to_chat(src,"<span class='userdanger'>Your BYOND client (v: [byond_version]) is out of date. This can cause glitches. We highly suggest you download the latest client from http://www.byond.com/ before playing. </span>")
 

code/modules/events/vent_clog.dm

@@ -29,7 +29,7 @@
 		R.add_reagent(pick(gunk), 50)
 
 		var/datum/effect_system/smoke_spread/chem/smoke = new
-		smoke.set_up(R, rand(1, 2), 0, vent, 0, silent = 1)
+		smoke.set_up(R, vent, TRUE)
 		playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 		smoke.start(3)
 		qdel(R)

code/modules/hydroponics/plant_genes.dm

@@ -409,8 +409,7 @@
 	var/datum/effect_system/smoke_spread/chem/S = new
 	var/splat_location = get_turf(target)
 	var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
-	S.attach(splat_location)
-	S.set_up(G.reagents, 2, 0, splat_location)
+	S.set_up(G.reagents, splat_location)
 	S.start(smoke_amount)
 	if(G && G.reagents)
 		G.reagents.clear_reagents()

code/modules/martial_arts/krav_maga.dm

@@ -132,13 +132,13 @@ datum/martial_art/krav_maga/grab_act(var/mob/living/carbon/human/A, var/mob/livi
 		if(D.hand)
 			if(istype(D.l_hand, /obj/item))
 				var/obj/item/I = D.l_hand
-				D.drop_item()
-				A.put_in_hands(I)
+				if(D.drop_item())
+					A.put_in_hands(I)
 		else
 			if(istype(D.r_hand, /obj/item))
 				var/obj/item/I = D.r_hand
-				D.drop_item()
-				A.put_in_hands(I)
+				if(D.drop_item())
+					A.put_in_hands(I)
 		D.visible_message("<span class='danger'>[A] has disarmed [D]!</span>", \
 							"<span class='userdanger'>[A] has disarmed [D]!</span>")
 		playsound(D, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)

code/modules/mob/language.dm

@@ -246,8 +246,8 @@
 	syllables = list("hs","zt","kr","st","sh")
 
 /datum/language/diona/get_random_name()
-	var/new_name = "[pick(list("To Sleep Beneath", "Wind Over", "Embrace of", "Dreams of", "Witnessing", "To Walk Beneath", "Approaching the", "Glimmer of", "The Ripple of", "Colors of", "The Still of", "Silence of", "Gentle Breeze of", "Glistening Waters under", "Child of", "Blessed Plant-ling of", "Grass-Walker of", "Element of", "Spawn of"))]"
-	new_name += " [pick(list("the Void", "the Sky", "Encroaching Night", "Planetsong", "Starsong", "the Wandering Star", "the Empty Day", "Daybreak", "Nightfall", "the Rain", "the Stars", "the Waves", "Dusk", "Night", "the Wind", "the Summer Wind", "the Blazing Sun", "the Scorching Sun", "Eternal Fields", "the Soothing Plains", "the Undying Fiona", "Mother Nature's Bousum"))]"
+	var/new_name = "[pick(list("To Sleep Beneath", "Wind Over", "Embrace Of", "Dreams Of", "Witnessing", "To Walk Beneath", "Approaching The", "Glimmer Of", "The Ripple Of", "Colors Of", "The Still Of", "Silence Of", "Gentle Breeze Of", "Glistening Waters Under", "Child Of", "Blessed Plant-Ling Of", "Grass-Walker Of", "Element Of", "Spawn Of"))]"
+	new_name += " [pick(list("The Void", "The Sky", "Encroaching Night", "Planetsong", "Starsong", "The Wandering Star", "The Empty Day", "Daybreak", "Nightfall", "The Rain", "The Stars", "The Waves", "Dusk", "Night", "The Wind", "The Summer Wind", "The Blazing Sun", "The Scorching Sun", "Eternal Fields", "The Soothing Plains", "The Undying Fiona", "Mother Nature's Bousum"))]"
 	return new_name
 
 /datum/language/trinary

code/modules/mob/new_player/sprite_accessories/human/human_hair.dm

@@ -684,6 +684,73 @@
 //////END POLARIS HAIRSTYLES///////
 //////////////////////////////////
 
+//////////////////////
+////Ume hairstyles////
+//////////////////////
+
+/datum/sprite_accessory/hair/eighties_ponytail
+	name = "80's ponytail"
+	icon_state = "80_ponytail"
+
+/datum/sprite_accessory/hair/eighties_ponytailalt
+	name = "80's ponytail alt"
+	icon_state = "80_ponytail_alt"
+
+/datum/sprite_accessory/hair/big_bow
+	name = "Big bow"
+	icon_state = "big_bow"
+
+/datum/sprite_accessory/hair/buns
+	name = "Buns"
+	icon_state = "buns"
+
+/datum/sprite_accessory/hair/himecut_long
+	name = "Himecut long"
+	icon_state = "himecut_long"
+
+/datum/sprite_accessory/hair/himecut_long_ponytail
+	name = "Himecut long ponytail"
+	icon_state = "himecut_long_ponytail"
+
+/datum/sprite_accessory/hair/himecut_ponytail
+	name = "Himecut ponytail"
+	icon_state = "himecut_ponytail"
+
+/datum/sprite_accessory/hair/ombre_twintails
+	name = "Ombre twintails"
+	icon_state = "ombre_twintails"
+
+/datum/sprite_accessory/hair/ombre_twintails_alt
+	name = "Ombre twintails alt"
+	icon_state = "ombre_twintails_alt"
+
+/datum/sprite_accessory/hair/sailor
+	name = "Sailor"
+	icon_state = "sailor"
+
+/datum/sprite_accessory/hair/amanita_short
+	name = "Amanita short"
+	icon_state = "amanita_short"
+
+/datum/sprite_accessory/hair/long_curls
+	name = "Long curls"
+	icon_state = "long_curls"
+
+/datum/sprite_accessory/hair/long_curls_alt
+	name = "Long curls alt"
+	icon_state = "long_curls_alt"
+
+/datum/sprite_accessory/hair/long_buns
+	name = "Long buns"
+	icon_state = "long_buns"
+
+/datum/sprite_accessory/hair/low_twins
+	name = "Low twins"
+	icon_state = "low_twins"
+
+///Ume hairs end here///
+
+
 ///Fluff HairStyles//
 /datum/sprite_accessory/hair/fluff/pinapple_fluff_hair //Pineapple Salad hair fluff its for a slime..has to go under human
 	name = "Sasook Hair"

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -265,14 +265,12 @@ datum/chemical_reaction/flash_powder
 
 /datum/chemical_reaction/smoke/on_reaction(datum/reagents/holder, created_volume)
 	for(var/f_reagent in forbidden_reagents)
-		if(holder.has_reagent(f_reagent))
-			holder.remove_reagent(f_reagent, holder.get_reagent_amount(f_reagent))
+		holder.del_reagent(f_reagent)
 	var/location = get_turf(holder.my_atom)
 	var/datum/effect_system/smoke_spread/chem/S = new
-	S.attach(location)
 	playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
 	if(S)
-		S.set_up(holder, 10, 0, location)
+		S.set_up(holder, location)
 		if(created_volume < 5)
 			S.start(1)
 		if(created_volume >=5 && created_volume < 10)

code/modules/research/experimentor.dm

@@ -318,7 +318,7 @@
 			R.add_reagent(chosenchem , 15)
 			investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor")
 			var/datum/effect_system/smoke_spread/chem/smoke = new
-			smoke.set_up(R, 1, 0, src, 0, silent = 1)
+			smoke.set_up(R, src, TRUE)
 			playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 			smoke.start()
 			qdel(R)
@@ -330,7 +330,7 @@
 			R.my_atom = src
 			R.add_reagent(chosenchem , 15)
 			var/datum/effect_system/smoke_spread/chem/smoke = new
-			smoke.set_up(R, 1, 0, src, 0, silent = 1)
+			smoke.set_up(R, src, TRUE)
 			playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 			smoke.start()
 			qdel(R)
@@ -417,7 +417,7 @@
 			R.add_reagent("frostoil" , 15)
 			investigate_log("Experimentor has released frostoil gas.", "experimentor")
 			var/datum/effect_system/smoke_spread/chem/smoke = new
-			smoke.set_up(R, 1, 0, src, 0, silent = 1)
+			smoke.set_up(R, src, TRUE)
 			playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
 			smoke.start()
 			qdel(R)