mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 12:08:28 +01:00
Mob nibble fix (#19542)
* Fix mob eating food pathway * Remove redundant alert * Moved eating message to better location * Apply suggestion from @Cameron-The-Raven --------- Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
8e7bccd52e
commit
bb47d45749
@@ -89,6 +89,8 @@
|
||||
var/obj/item/TrashItem = new trash(eater)
|
||||
eater.put_in_hands(TrashItem)
|
||||
qdel(src)
|
||||
return
|
||||
eater.balloon_alert_visible("nibbles away at \the [src].","nibbled away at \the [src].")
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
@@ -424,8 +426,6 @@
|
||||
/obj/item/reagent_containers/food/snacks/attack_generic(mob/living/user)
|
||||
if(!isanimal(user) && !isalien(user))
|
||||
return
|
||||
user.visible_message(span_infoplain(span_bold("[user]") + " nibbles away at \the [src]."),span_info("You nibble away at \the [src]."))
|
||||
user.balloon_alert_visible("nibbles away at \the [src].","nibbled away at \the [src].")
|
||||
bitecount++
|
||||
if(reagents)
|
||||
reagents.trans_to_mob(user, bitesize, CHEM_INGEST)
|
||||
|
||||
@@ -24,6 +24,10 @@
|
||||
if(istype(A,/obj/structure/micro_tunnel)) //Allows simplemobs to click on mouse holes, mice should be allowed to go in mouse holes, and other mobs
|
||||
var/obj/structure/micro_tunnel/t = A //should be allowed to drag the mice out of the mouse holes!
|
||||
t.tunnel_interact(src)
|
||||
if(istype(A,/obj/item/reagent_containers/food/snacks))
|
||||
var/obj/item/reagent_containers/food/snacks/snack = A
|
||||
snack.attack_generic(src)
|
||||
setClickCooldown(get_attack_speed(src))
|
||||
|
||||
if(I_HURT)
|
||||
if(can_special_attack(A) && special_attack_target(A))
|
||||
|
||||
Reference in New Issue
Block a user