Skip to content

Commit

Permalink
bugfix: Few Bugs Fixed (#5794)
Browse files Browse the repository at this point in the history
* Few Bugs Fixed

* Effects Clean
  • Loading branch information
Gottfrei authored Aug 23, 2024
1 parent 7e77649 commit 9f9855f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/datums/keybindings/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "Шуршать перьями (воксы)"


Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/soap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9f9855f

Please sign in to comment.