From 860fe663b55cfcaf8b5e1bbcf997623b476d5ef8 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 20 Sep 2017 22:20:44 -0400 Subject: [PATCH 1/2] axes runtime's unstoppable horniness --- code/datums/mind.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index e824cc9914..5d45855038 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -121,8 +121,9 @@ 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 + if(L.client && L.prefs) + 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]
" From 0d653c9f44fe25ad3daf6d52f1beea64d49ca636 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 20 Sep 2017 22:39:58 -0400 Subject: [PATCH 2/2] im unrobust --- code/datums/mind.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 5d45855038..765b1f18aa 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -121,7 +121,7 @@ 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 - if(L.client && L.prefs) + if(L.client && L.client.prefs) 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