Merge branch 'master' into hair-gradients

code/modules/surgery/organs/augments_internal.dm

@@ -99,12 +99,12 @@
 	if(L_item)
 		A = pick(oview(range))
 		L_item.throw_at(A, range, 2)
-		to_chat(owner, "<span class='notice'>Your left arm spasms and throws the [L_item.name]!</span>")
+		to_chat(owner, "<span class='notice'>Your left arm spasms and throws [L_item]!</span>")
 		l_hand_obj = null
 	if(R_item)
 		A = pick(oview(range))
 		R_item.throw_at(A, range, 2)
-		to_chat(owner, "<span class='notice'>Your right arm spasms and throws the [R_item.name]!</span>")
+		to_chat(owner, "<span class='notice'>Your right arm spasms and throws [R_item]!</span>")
 		r_hand_obj = null
 
 /obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items()

code/modules/surgery/organs/autosurgeon.dm

@@ -89,10 +89,10 @@
 	starting_organ = /obj/item/organ/internal/cyberimp/arm/gun/laser
 
 /obj/item/autosurgeon/organ/syndicate/thermal_eyes
-	starting_organ = /obj/item/organ/internal/eyes/cybernetic/thermals
+	starting_organ = /obj/item/organ/internal/eyes/cybernetic/thermals/hardened
 
 /obj/item/autosurgeon/organ/syndicate/xray_eyes
-	starting_organ = /obj/item/organ/internal/eyes/cybernetic/xray
+	starting_organ = /obj/item/organ/internal/eyes/cybernetic/xray/hardened
 
 /obj/item/autosurgeon/organ/syndicate/anti_stun
 	starting_organ = /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened

code/modules/surgery/organs/eyes.dm

@@ -137,6 +137,12 @@
 	vision_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
 	origin_tech = "materials=4;programming=4;biotech=7;magnets=4"
 
+/obj/item/organ/internal/eyes/cybernetic/xray/hardened
+	name = "hardened X-ray eyes"
+	desc = "These cybernetic eyes will give you X-ray vision. Blinking is futile. This pair has been hardened for special operations personnel."
+	emp_proof = TRUE
+	origin_tech = "materials=6;programming=5;biotech=7;magnets=6;syndicate=3"
+
 /obj/item/organ/internal/eyes/cybernetic/thermals
 	name = "thermal eyes"
 	desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included."
@@ -147,6 +153,12 @@
 	see_in_dark = 8
 	origin_tech = "materials=5;programming=4;biotech=4;magnets=4;syndicate=1"
 
+/obj/item/organ/internal/eyes/cybernetic/thermals/hardened
+	name = "hardened thermal eyes"
+	desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included. This pair has been hardened for special operations personnel."
+	emp_proof = TRUE
+	origin_tech = "materials=6;programming=5;biotech=6;magnets=6;syndicate=3"
+
 /obj/item/organ/internal/eyes/cybernetic/flashlight
 	name = "flashlight eyes"
 	desc = "It's two flashlights rigged together with some wire. Why would you put these in someone's head?"

code/modules/surgery/organs/heart.dm

@@ -64,8 +64,9 @@
 
 /obj/item/organ/internal/heart/prepare_eat()
 	var/obj/S = ..()
-	S.icon_state = dead_icon
-	return S
+	if(S)
+		S.icon_state = dead_icon
+		return S
 
 /obj/item/organ/internal/heart/cursed
 	name = "cursed heart"

code/modules/surgery/organs/lungs.dm

@@ -304,8 +304,9 @@
 
 /obj/item/organ/internal/lungs/prepare_eat()
 	var/obj/S = ..()
-	S.reagents.add_reagent("salbutamol", 5)
-	return S
+	if(S)
+		S.reagents.add_reagent("salbutamol", 5)
+		return S
 
 /obj/item/organ/internal/lungs/plasmaman
 	name = "plasma filter"

code/modules/surgery/organs/organ_external.dm

@@ -400,7 +400,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 //Updates brute_damn and burn_damn from wound damages. Updates BLEEDING status.
 /obj/item/organ/external/proc/check_fracture(damage_inflicted)
-	if(config.bones_can_break && brute_dam > min_broken_damage && !is_robotic())
+	if(GLOB.configuration.general.breakable_bones && brute_dam > min_broken_damage && !is_robotic())
 		if(prob(damage_inflicted))
 			fracture()
 

code/modules/surgery/organs/vocal_cords.dm

@@ -252,7 +252,7 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
 	else if((findtext(message, GLOB.hallucinate_words)))
 		for(var/V in listeners)
 			var/mob/living/L = V
-			new /obj/effect/hallucination/delusion(get_turf(L),L,duration=150 * power_multiplier,skip_nearby=0)
+			new /obj/effect/hallucination/delusion(get_turf(L), L)
 		next_command = world.time + cooldown_meme
 
 	//WAKE UP

code/modules/surgery/robotics.dm

@@ -209,7 +209,7 @@
 		current_type = "burn"
 		var/obj/item/stack/cable_coil/C = tool
 		if(!(affected.burn_dam > 0))
-			to_chat(user, "<span class='warning'>The [affected] does not have any burn damage!</span>")
+			to_chat(user, "<span class='warning'>\The [affected] does not have any burn damage!</span>")
 			return -1
 		if(!istype(C))
 			return -1
@@ -223,7 +223,7 @@
 	else if(implement_type in implements_heal_brute)
 		current_type = "brute"
 		if(!(affected.brute_dam > 0 || affected.disfigured))
-			to_chat(user, "<span class='warning'>The [affected] does not require welding repair!</span>")
+			to_chat(user, "<span class='warning'>\The [affected] does not require welding repair!</span>")
 			return -1
 		if(tool.tool_behaviour == TOOL_WELDER)
 			if(!tool.use(1))