From c0cc42821671ac9caebb115863c2bd64b89fcbb5 Mon Sep 17 00:00:00 2001 From: ktccd Date: Tue, 8 Aug 2017 19:45:06 +0200 Subject: [PATCH] Makes mindtransfers respect arousal Clients arousal preferences are now taken into account when transferring minds. --- code/datums/mind.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 3515440499..7017149d53 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -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]
"