diff --git a/code/datums/keybindings/emote.dm b/code/datums/keybindings/emote.dm index 8891cb71a72..a8006c729a4 100644 --- a/code/datums/keybindings/emote.dm +++ b/code/datums/keybindings/emote.dm @@ -512,8 +512,8 @@ /** * Vox */ -/datum/keybinding/emote/carbon/human/quill - linked_emote ="quill" +/datum/keybinding/emote/carbon/human/vox/quill + linked_emote = /datum/emote/living/carbon/human/vox/quill name = "Шуршать перьями (воксы)" diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 9e9e3fafb22..1474375d61a 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -18,7 +18,7 @@ AddComponent(/datum/component/slippery, 4 SECONDS, lube_flags = (SLIDE|SLIP_WHEN_LYING)) /obj/item/soap/afterattack(atom/target, mob/user, proximity, params) - if(!proximity || iseffect(target)) + if(!proximity) return //I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing. //So this is a workaround. This also makes more sense from an IC standpoint. ~Carn diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 39c6efd71fb..3d091189db1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1547,13 +1547,13 @@ Eyes need to have significantly high darksight to shine unless the mob has the X return TRUE /mob/living/carbon/human/selfFeed(obj/item/reagent_containers/food/toEat, fullness) - if(!check_has_mouth()) + if(!istype(toEat, /obj/item/reagent_containers/food/pill/patch) && !check_has_mouth()) to_chat(src, "Where do you intend to put [toEat]? You don't have a mouth!") return FALSE return ..() /mob/living/carbon/human/forceFed(obj/item/reagent_containers/food/toEat, mob/user, fullness) - if(!check_has_mouth()) + if(!istype(toEat, /obj/item/reagent_containers/food/pill/patch) && !check_has_mouth()) if(!((istype(toEat, /obj/item/reagent_containers/food/drinks) && (ismachineperson(src))))) to_chat(user, "Where do you intend to put [toEat]? [src] doesn't have a mouth!") return FALSE