Last staging fixes

code/__HELPERS/type2type.dm

@@ -281,7 +281,7 @@
 
 //Argument: Give this a space-separated string consisting of 6 numbers. Returns null if you don't
 /proc/text2matrix(var/matrixtext)
-	var/list/matrixtext_list = text2list(matrixtext, " ")
+	var/list/matrixtext_list = splittext(matrixtext, " ")
 	var/list/matrix_list = list()
 	for(var/item in matrixtext_list)
 		var/entry = text2num(item)
@@ -296,4 +296,4 @@
 	var/d = matrix_list[4]
 	var/e = matrix_list[5]
 	var/f = matrix_list[6]
-	return matrix(a, b, c, d, e, f)
+	return matrix(a, b, c, d, e, f)

code/_onclick/hud/bot.dm

@@ -47,24 +47,9 @@
 	mymob.pullin.update_icon(mymob)
 	mymob.pullin.screen_loc = ui_bot_pull
 
-	mymob.blind = new /obj/screen()
-	mymob.blind.icon = 'icons/mob/screen1_full.dmi'
-	mymob.blind.icon_state = "blackimageoverlay"
-	mymob.blind.name = " "
-	mymob.blind.screen_loc = "CENTER-7,CENTER-7"
-	mymob.blind.layer = 0
-	mymob.blind.mouse_opacity = 0
-
-	mymob.flash = new /obj/screen()
-	mymob.flash.icon = 'icons/mob/screen1_bot.dmi'
-	mymob.flash.icon_state = "blank"
-	mymob.flash.name = "flash"
-	mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
-	mymob.flash.layer = 17
-
 	mymob.client.screen = list()
 
-	mymob.client.screen += list(mymob.oxygen, mymob.fire, mymob.healths, mymob.pullin, mymob.blind, mymob.flash)
+	mymob.client.screen += list(mymob.oxygen, mymob.fire, mymob.healths, mymob.pullin)
 	mymob.client.screen += adding + other
 	mymob.client.screen += mymob.client.void
 	return

code/_onclick/hud/fullscreen.dm

@@ -26,20 +26,24 @@
 		client.screen += screen
 	return screen
 
-/mob/proc/clear_fullscreen(category, animate = 10)
-	set waitfor = 0
+/mob/proc/clear_fullscreen(category, animated = 10)
 	var/obj/screen/fullscreen/screen = screens[category]
 	if(!screen)
 		return
 
-	if(animate)
-		animate(screen, alpha = 0, time = animate)
-		sleep(animate)
-
 	screens -= category
-	if(client)
-		client.screen -= screen
-	qdel(screen)
+
+	if(animated)
+		spawn(0)
+			animate(screen, alpha = 0, time = animated)
+			sleep(animated)
+			if(client)
+				client.screen -= screen
+			qdel(screen)
+	else
+		if(client)
+			client.screen -= screen
+		qdel(screen)
 
 /mob/proc/clear_fullscreens()
 	for(var/category in screens)

code/_onclick/hud/hud.dm

@@ -125,8 +125,6 @@ datum/hud/New(mob/owner)
 		guardian_hud()
 	else if(ispet(mymob))
 		corgi_hud()
-	else
-		
 
 	reload_fullscreen()
 

code/datums/diseases/advance/advance.dm

@@ -294,7 +294,7 @@ var/list/advance_cures = 	list(
 		for(var/datum/symptom/S in symptoms)
 			L += S.id
 		L = sortList(L) // Sort the list so it doesn't matter which order the symptoms are in.
-		var/result = list2text(L, ":")
+		var/result = jointext(L, ":")
 		id = result
 	return id
 

code/game/machinery/vending.dm

@@ -101,26 +101,16 @@
 	..()
 	wires = new(src)
 	spawn(50)
-<<<<<<< HEAD
 		if(product_slogans)
-			slogan_list += text2list(product_slogans, ";")
-=======
-		if(src.product_slogans)
-			src.slogan_list += splittext(src.product_slogans, ";")
->>>>>>> byond510
+			slogan_list += splittext(product_slogans, ";")
 
 			// So not all machines speak at the exact same time.
 			// The first time this machine says something will be at slogantime + this random value,
 			// so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated.
 			last_slogan = world.time + rand(0, slogan_delay)
 
-<<<<<<< HEAD
 		if(product_ads)
-			ads_list += text2list(product_ads, ";")
-=======
-		if(src.product_ads)
-			src.ads_list += splittext(src.product_ads, ";")
->>>>>>> byond510
+			ads_list += splittext(product_ads, ";")
 
 		build_inventory()
 		power_change()

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -31,7 +31,7 @@
 			var/mob/living/carbon/human/H = M
 			var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
 			if(E)
-				E.damage += eye_damage
+				E.damage += rand(1, 3)
 		M.Stun(max(10/distance, 3))
 		M.Weaken(max(10/distance, 3))
 

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

@@ -315,33 +315,39 @@
 	if(.)
 		if(visual)
 			return
+		var/obj/item/organ/internal/eyes/E = get_int_organ(/obj/item/organ/internal/eyes)
+		if(!E)
+			return
+
 		switch(damage)
 			if(1)
 				src << "<span class='warning'>Your eyes sting a little.</span>"
-				/*if(prob(40)) //waiting on carbon organs
-					eye_stat += 1*/
+				if(prob(40)) //waiting on carbon organs
+					E.damage += 1
 
 			if(2)
 				src << "<span class='warning'>Your eyes burn.</span>"
-				//eye_stat += rand(2, 4)
+				E.damage += rand(2, 4)
 
 			else
 				src << "Your eyes itch and burn severely!</span>"
-				//eye_stat += rand(12, 16)
+				E.damage += rand(12, 16)
 
-		/*if(eye_stat > 10)
+		if(E.damage > E.min_bruised_damage)
 			eye_blind += damage
 			eye_blurry += damage * rand(3, 6)
 
-			if(eye_stat > 20)
-				if (prob(eye_stat - 20))
+			if(E.damage > (E.min_bruised_damage + E.min_broken_damage) / 2)
+				if(!(E.status & ORGAN_ROBOT))
 					src << "<span class='warning'>Your eyes start to burn badly!</span>"
-					disabilities |= NEARSIGHTED
-				else if(prob(eye_stat - 25))
-					src << "<span class='warning'>You can't see anything!</span>"
-					sdisabilities |= BLIND
+				else //snowflake conditions piss me off for the record
+					src << "<span class='warning'>The flash blinds you!</span>"
+
+			else if(E.damage >= E.min_broken_damage)
+				src << "<span class='warning'>You can't see anything!</span>"
+
 			else
-				src << "<span class='warning'>Your eyes are really starting to hurt. This can't be good for you!</span>"*/
+				src << "<span class='warning'>Your eyes are really starting to hurt. This can't be good for you!</span>"
 		return 1
 
 	else if(damage == 0) // just enough protection

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

@@ -401,43 +401,3 @@ This function restores all organs.
 	// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
 	updatehealth()
 	return 1
-
-// CARBON ORGANS: REMOVE THIS SHIT
-/mob/living/carbon/human/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
-	. = ..()
-	var/obj/item/organ/eyes/E = internal_organs_by_name["eyes"]
-	if(!E)
-		return
-
-	var/damage = intensity - check_eye_prot()
-	if(.)
-		if(visual)
-			return
-		switch(damage)
-			if(1)
-				if(prob(40))
-					E.damage += 1
-			if(2)
-				E.damage += rand(2, 4)
-			else
-				E.damage += rand(12, 16)
-
-		if(E.damage > 10)
-			eye_blind += damage
-			eye_blurry += damage * rand(3, 6)
-
-			if(E.damage > 20)
-				if (prob(E.damage - 20))
-					src << "<span class='warning'>Your eyes start to burn badly!</span>"
-					disabilities |= NEARSIGHTED
-				else if(prob(E.damage - 25))
-					src << "<span class='warning'>You can't see anything!</span>"
-					sdisabilities |= BLIND
-			else
-				src << "<span class='warning'>Your eyes are really starting to hurt. This can't be good for you!</span>"
-		return 1
-
-	else if(damage == 0) // just enough protection
-		if(prob(20))
-			src << "<span class='notice'>Something bright flashes in the corner of your vision!</span>"
-

code/modules/mob/living/simple_animal/bees.dm

@@ -49,7 +49,6 @@
 	//if we're chasing someone, get a little bit angry
 	if(target_mob && prob(10))
 		feral++
-		M.flash_pain()
 
 	//calm down a little bit
 	if(feral > 0)

code/modules/surgery/organs/augments_eyes.dm

@@ -60,7 +60,7 @@
 		if(prob(10 * severity))
 			return
 	owner << "<span class='warning'>Static obfuscates your vision!</span>"
-	flick("e_flash", owner.flash)
+	owner.flash_eyes(visual = 1)