From 90ce3afcc5c1a6a3e7ee0c150c0e92cb79508646 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 24 Dec 2022 16:17:10 +1000 Subject: [PATCH 1/2] Fixes runtime with autoresleeving language application --- code/modules/resleeving/autoresleever.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm index 1e6753f4d77..f851ccbd1ad 100644 --- a/code/modules/resleeving/autoresleever.dm +++ b/code/modules/resleeving/autoresleever.dm @@ -165,7 +165,7 @@ for(var/lang in ghost_client.prefs.alternate_languages) var/datum/language/chosen_language = GLOB.all_languages[lang] if(chosen_language) - if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs))) + if(is_lang_whitelisted(ghost,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs))) new_character.add_language(lang) for(var/key in ghost_client.prefs.language_custom_keys) if(ghost_client.prefs.language_custom_keys[key]) From 164659ac4f8c22bb55c8227fe82a7a5e84e7cace Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 24 Dec 2022 16:47:33 +1000 Subject: [PATCH 2/2] Fixes runtime with applying lipstick to others --- code/game/objects/items/weapons/cosmetics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 5e93f2d0316..e2d9ad6a496 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -56,7 +56,7 @@ else user.visible_message("[user] begins to do [H]'s lips with \the [src].", \ "You begin to apply \the [src].") - if(do_after(user, 20) && do_after(H, 20, 5, 0)) //user needs to keep their active hand, H does not. + if(do_after(user, 20, H)) //user needs to keep their active hand, H does not. user.visible_message("[user] does [H]'s lips with \the [src].", \ "You apply \the [src].") H.lip_style = colour