Merge pull request #2754 from CIB/bleeding-edge-freeze

Merge main into BEF

code/modules/client/preferences.dm

@@ -252,7 +252,7 @@ datum/preferences
 		dat += "Blood Type: <a href='byond://?src=\ref[user];preference=b_type;task=input'>[b_type]</a><br>"
 		dat += "Skin Tone: <a href='?_src_=prefs;preference=s_tone;task=input'>[-s_tone + 35]/220<br></a>"
 		//dat += "Skin pattern: <a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust</a><br>"
-		dat += "Needs Glasses: <a href='?_src_=prefs;preference=disabilities'><b>[disabilities == 0 ? "No" : "Yes"]</b></a><br>"
+		//dat += "Needs Glasses: <a href='?_src_=prefs;preference=disabilities'><b>[disabilities == 0 ? "No" : "Yes"]</b></a><br>"
 		dat += "Limbs: <a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust</a><br>"
 
 		//display limbs below

code/modules/client/preferences_savefile.dm

@@ -119,6 +119,7 @@
 	S["eyes_blue"]			>> b_eyes
 	S["underwear"]			>> underwear
 	S["backbag"]			>> backbag
+	S["b_type"]				>> b_type
 
 	//Jobs
 	S["userandomjob"]		>> userandomjob
@@ -170,6 +171,7 @@
 	b_eyes			= sanitize_integer(b_eyes, 0, 255, initial(b_eyes))
 	underwear		= sanitize_integer(underwear, 1, underwear_m.len, initial(underwear))
 	backbag			= sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
+	b_type			= sanitize_text(b_type, initial(b_type))
 
 	userandomjob	= sanitize_integer(userandomjob, 0, 1, initial(userandomjob))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
@@ -218,6 +220,7 @@
 	S["eyes_blue"]			<< b_eyes
 	S["underwear"]			<< underwear
 	S["backbag"]			<< backbag
+	S["b_type"]				<< b_type
 
 	//Jobs
 	S["userandomjob"]		<< userandomjob

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

@@ -50,6 +50,7 @@
 		src.searching = 0
 		src.brainmob.mind = candidate.mind
 		src.brainmob.key = candidate.key
+		src.brainmob.ckey = candidate.ckey
 		src.name = "positronic brain ([src.brainmob.name])"
 
 		src.brainmob << "<b>You are a positronic brain, brought into existence on [station_name()].</b>"

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

@@ -117,7 +117,7 @@ emp_act
 	if(!target_zone)
 		visible_message("\red <B>[user] misses [src] with \the [I]!")
 		return
-		
+
 	var/datum/organ/external/affecting = get_organ(target_zone)
 	if (!affecting)
 		return
@@ -152,7 +152,7 @@ emp_act
 				location.add_blood(src)
 			if(ishuman(user))
 				var/mob/living/carbon/human/H = user
-				if(get_dist(H, src) > 1) //people with TK won't get smeared with blood
+				if(get_dist(H, src) <= 1) //people with TK won't get smeared with blood
 					H.bloody_body(src)
 					H.bloody_hands(src)
 

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

@@ -150,6 +150,7 @@
 
 		src.mind = M.brainmob.mind
 		src.mind.key = M.brainmob.key
+		src.ckey = M.brainmob.ckey
 		src.name = "Spider-bot ([M.brainmob.name])"
 
 /mob/living/simple_animal/spiderbot/proc/explode() //When emagged.
@@ -162,12 +163,13 @@
 
 /mob/living/simple_animal/spiderbot/proc/update_icon()
 	if(mmi)
-		if (istype(mmi,/obj/item/device/mmi))
+		if(istype(mmi,/obj/item/device/mmi))
 			icon_state = "spiderbot-chassis-mmi"
 			icon_living = "spiderbot-chassis-mmi"
-		else
+		if(istype(mmi, /obj/item/device/mmi/posibrain))
 			icon_state = "spiderbot-chassis-posi"
 			icon_living = "spiderbot-chassis-posi"
+
 	else
 		icon_state = "spiderbot-chassis"
 		icon_living = "spiderbot-chassis"
@@ -326,6 +328,7 @@
 				visible_message("\blue [src] scoops up \the [held_item]!", "\blue You grab \the [held_item]!", "You hear a skittering noise and a clink.")
 				return held_item
 		src << "\red \The [selection] is too far away."
+		return 0
 
 	src << "\red There is nothing of interest to take."
 	return 0

html/changelog.html

@@ -46,6 +46,7 @@ Header Section
 		</td>
 	</tr>
 </table>
+<!-- <font size='4' color='red'><b>Visit the bleeding-edge test server at <a href="byond://tekkit.fallemmc.com:8000">byond://tekkit.fallemmc.com:8000</a></b></font>--!>
 
 <!-- 
 Changelog Section