diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index b4b33ee76544..d8c7743fa634 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -100,10 +100,10 @@ ..() /mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE)//Prevents mouse from pulling things - if(istype(AM, /obj/item/food/sliced/cheesewedge)) + if(isfood(AM)) // SS220 EDIT - Mouse pulling return ..() // Get dem if(show_message) - to_chat(src, "You are too small to pull anything except cheese.") + to_chat(src, "Ты слишком крохотный, чтобы тянуть что-то кроме еды.") // SS220 EDIT - Mouse pulling return /mob/living/simple_animal/mouse/proc/on_atom_entered(datum/source, atom/movable/entered) diff --git a/modular_ss220/mobs/code/simple_animal/friendly/mouse.dm b/modular_ss220/mobs/code/simple_animal/friendly/mouse.dm index 992c1fb45ce7..466b85ffa24a 100644 --- a/modular_ss220/mobs/code/simple_animal/friendly/mouse.dm +++ b/modular_ss220/mobs/code/simple_animal/friendly/mouse.dm @@ -162,24 +162,6 @@ else CRASH("Unknown status: [new_status]") -//Prevents mouse from pulling things -/mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE) - if(istype(AM, /obj/item/food)) - // This is stolen from mob/living/start_pulling - // because i can't call it from here ..() - // insted it will call upstream version of mouse/start_pulling - // Let me know if you know how to do it better - if(!(AM.can_be_pulled(src, state, force, show_message))) - return FALSE - if(incapacitated()) - return - if(SEND_SIGNAL(src, COMSIG_LIVING_TRY_PULL, AM, force) & COMSIG_LIVING_CANCEL_PULL) - return FALSE - return - if(show_message) - to_chat(src, span_warning("Ты слишком крохотный, чтобы тянуть что-то кроме еды.")) - return - // Вызывается, когда мышка кликает на еду, можно кушать только одну еду за раз. /mob/living/simple_animal/mouse/proc/consume(obj/item/food/F) if(busy)