mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 00:35:45 +01:00
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull
This commit is contained in:
@@ -125,10 +125,12 @@
|
||||
|
||||
//VOREStation Add
|
||||
/obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob)
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.species.eat_ore == 1)
|
||||
H.eat_ore(src)
|
||||
return
|
||||
if(M.handle_eat_ore(src, user))
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/item/weapon/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||
if(user.handle_eat_ore(src))
|
||||
return
|
||||
..()
|
||||
//VOREStation Add End
|
||||
|
||||
Reference in New Issue
Block a user