Merge remote-tracking branch 'upstream/master' into abductor-update

code/modules/surgery/organs/augments_chest.dm

@@ -129,7 +129,7 @@
 	var/datum/effect_system/trail_follow/ion/ion_trail
 
 /obj/item/organ/cyberimp/chest/thrusters/Insert(mob/living/carbon/M, special = 0)
-	..()
+	. = ..()
 	if(!ion_trail)
 		ion_trail = new
 	ion_trail.set_up(M)
@@ -151,10 +151,14 @@
 		on = TRUE
 		if(allow_thrust(0.01))
 			ion_trail.start()
+			RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/move_react)
+			owner.add_movespeed_modifier(MOVESPEED_ID_CYBER_THRUSTER, priority=100, multiplicative_slowdown=-2, movetypes=FLOATING, conflict=MOVE_CONFLICT_JETPACK)
 			if(!silent)
 				to_chat(owner, "<span class='notice'>You turn your thrusters set on.</span>")
 	else
 		ion_trail.stop()
+		UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
+		owner.remove_movespeed_modifier(MOVESPEED_ID_CYBER_THRUSTER)
 		if(!silent)
 			to_chat(owner, "<span class='notice'>You turn your thrusters set off.</span>")
 		on = FALSE
@@ -169,6 +173,9 @@
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
 
+/obj/item/organ/cyberimp/chest/thrusters/proc/move_react()
+	allow_thrust(0.01)
+
 /obj/item/organ/cyberimp/chest/thrusters/proc/allow_thrust(num)
 	if(!on || !owner)
 		return 0

code/modules/surgery/organs/heart.dm

@@ -57,7 +57,7 @@
 
 /obj/item/organ/heart/prepare_eat()
 	var/obj/S = ..()
-	S.icon_state = "heart-off"
+	S.icon_state = "[icon_base]-off"
 	return S
 
 /obj/item/organ/heart/on_life()
@@ -90,6 +90,12 @@
 		owner.set_heartattack(TRUE)
 		failed = TRUE
 
+obj/item/organ/heart/slime
+	name = "slime heart"
+	desc = "It seems we've gotten to the slimy core of the matter."
+	icon_state = "heart-s-on"
+	icon_base = "heart-s"
+
 /obj/item/organ/heart/cursed
 	name = "cursed heart"
 	desc = "A heart that, when inserted, will force you to pump it manually."
@@ -212,6 +218,19 @@ obj/item/organ/heart/cybernetic/upgraded/on_life()
 
 
 
+/obj/item/organ/heart/ipc
+	name = "IPC heart"
+	desc = "An electronic pump that regulates hydraulic functions, they have an auto-restart after EMPs."
+	icon_state = "heart-c"
+	organ_flags = ORGAN_SYNTHETIC
+
+/obj/item/organ/heart/ipc/emp_act()
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
+	Stop()
+	addtimer(CALLBACK(src, .proc/Restart), 10)
+
 /obj/item/organ/heart/freedom
 	name = "heart of freedom"
 	desc = "This heart pumps with the passion to give... something freedom."

code/modules/surgery/organs/tongue.dm

@@ -259,7 +259,6 @@
 	name = "plasma bone \"tongue\""
 	desc = "Like animated skeletons, Plasmamen vibrate their teeth in order to produce speech."
 	icon_state = "tongueplasma"
-	maxHealth = "alien"
 	modifies_speech = FALSE
 
 /obj/item/organ/tongue/robot

code/modules/surgery/organs/vocal_cords.dm

@@ -917,7 +917,7 @@
 					speaktrigger += "[(H.client?.prefs.lewdchem?"You are my whole world and all of my being belongs to you, ":"I cannot think of anything else but aiding your cause, ")] "//Redflags!!
 
 			//mood
-			GET_COMPONENT_FROM(mood, /datum/component/mood, H)
+			var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
 			switch(mood.sanity)
 				if(SANITY_GREAT to INFINITY)
 					speaktrigger += "I'm beyond elated!! " //did you mean byond elated? hohoho