Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447

code/modules/surgery/organs/eyes.dm

@@ -44,13 +44,9 @@
 			eye_color = H.eye_color
 		if(!special)
 			H.dna?.species?.handle_body() //regenerate eyeballs overlays.
-		if(HAS_TRAIT(H, TRAIT_NIGHT_VISION) && !lighting_alpha)
-			lighting_alpha = LIGHTING_PLANE_ALPHA_NV_TRAIT
-			see_in_dark = 8
 	M.update_tint()
 	owner.update_sight()
 
-
 /obj/item/organ/eyes/Remove(mob/living/carbon/M, special = 0)
 	clear_eye_trauma()
 	. = ..()

code/modules/surgery/organs/heart.dm

@@ -55,6 +55,11 @@
 	update_icon()
 	return 1
 
+/obj/item/organ/heart/proc/HeartStrengthMessage()
+	if(beating)
+		return "a healthy"
+	return "<span class='danger'>an unstable</span>"
+
 /obj/item/organ/heart/prepare_eat()
 	var/obj/S = ..()
 	S.icon_state = "[icon_base]-off"

code/modules/surgery/organs/tongue.dm

@@ -22,6 +22,7 @@
 		/datum/language/ratvar,
 		/datum/language/aphasia,
 		/datum/language/slime,
+		/datum/language/vampiric,
 	))
 	healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
 	decay_factor = STANDARD_ORGAN_DECAY/2
@@ -124,6 +125,32 @@
 	taste_sensitivity = 101 // ayys cannot taste anything.
 	maxHealth = 120 //Ayys probe a lot
 	modifies_speech = TRUE
+	var/mothership
+
+/obj/item/organ/tongue/abductor/attack_self(mob/living/carbon/human/H)
+	if(!istype(H))
+		return
+
+	var/obj/item/organ/tongue/abductor/T = H.getorganslot(ORGAN_SLOT_TONGUE)
+	if(!istype(T))
+		return
+
+	if(T.mothership == mothership)
+		to_chat(H, "<span class='notice'>[src] is already attuned to the same channel as your own.</span>")
+		return
+
+	H.visible_message("<span class='notice'>[H] holds [src] in their hands, and concentrates for a moment.</span>", "<span class='notice'>You attempt to modify the attunation of [src].</span>")
+	if(do_after(H, delay=15, target=src))
+		to_chat(H, "<span class='notice'>You attune [src] to your own channel.</span>")
+		mothership = T.mothership
+
+/obj/item/organ/tongue/abductor/examine(mob/M)
+	. = ..()
+	if(HAS_TRAIT(M, TRAIT_ABDUCTOR_TRAINING) || HAS_TRAIT(M.mind, TRAIT_ABDUCTOR_TRAINING) || isobserver(M))
+		if(!mothership)
+			. += "<span class='notice'>It is not attuned to a specific mothership.</span>"
+		else
+			. += "<span class='notice'>It is attuned to [mothership].</span>"
 
 /obj/item/organ/tongue/abductor/handle_speech(datum/source, list/speech_args)
 	//Hacks