mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
Makes player-controlled simplemobs not do attacks when on grab intent
This commit is contained in:
@@ -30,6 +30,8 @@
|
||||
if(I_GRAB)
|
||||
if(has_hands)
|
||||
A.attack_hand(src)
|
||||
else if(isliving(A) && src.client)
|
||||
animal_nom(A)
|
||||
else
|
||||
attack_target(A)
|
||||
|
||||
|
||||
@@ -277,13 +277,6 @@
|
||||
return MOVEMENT_FAILED //Mobs aren't that stupid, probably
|
||||
return ..() // Procede as normal.
|
||||
|
||||
//Grab = Nomf
|
||||
/mob/living/simple_mob/UnarmedAttack(var/atom/A, var/proximity)
|
||||
. = ..()
|
||||
|
||||
if(a_intent == I_GRAB && isliving(A) && !has_hands)
|
||||
animal_nom(A)
|
||||
|
||||
// Riding
|
||||
/datum/riding/simple_mob
|
||||
keytype = /obj/item/weapon/material/twohanded/riding_crop // Crack!
|
||||
|
||||
Reference in New Issue
Block a user