Merge pull request #2309 from ktccd/Arousal-clone-fix

Makes mindtransfers respect arousal
2017-08-09 02:22:02 -05:00
parent defbaf18da c0cc428216
commit 9a7d9e6413
1 changed files with 4 additions and 0 deletions
@@ -120,6 +120,10 @@
 	transfer_martial_arts(new_character)
 	if(active || force_key_move)
 		new_character.key = key		//now transfer the key to link the client to our new body
+	if(isliving(new_character)) //New humans and such are by default enabled arousal. Let's always use the new mind's prefs.
+		var/mob/living/L = new_character
+		L.canbearoused = L.client.prefs.arousable //Technically this should make taking over a character mean the body gain the new minds setting...
+		L.update_arousal_hud() //Removes the old icon

 /datum/mind/proc/store_memory(new_text)
 	memory += "[new_text]<BR>"