diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 7aacec50bd..56b732efe8 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -380,32 +380,33 @@ return /mob/living/silicon/pai/attack_hand(mob/user as mob) - //Chompstation edit - if(user.a_intent == I_HELP) - visible_message("[user.name] [rand("pets","pats")] [src].") - else if(user.a_intent == I_GRAB) - if(user == src || anchored) - return 0 - for(var/obj/item/weapon/grab/G in src.grabbed_by) - if(G.assailant == user) - user << "You already grabbed [src]." +//Chompstation edit + switch(user.a_intent) + if(I_HELP) + visible_message("[user.name] [pick("pets","pats")] [src].") + if(I_GRAB) + if(user == src || anchored) return - var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src) - if(buckled) - user << "You cannot grab [src], they're buckled in!" - if(!G) //the grab will delete itself in New if affecting is anchored - return - user.put_in_active_hand(G) - G.synch() - LAssailant = user + for(var/obj/item/weapon/grab/G in src.grabbed_by) + if(G.assailant == user) + user << "You already grabbed [src]." + return + var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src) + if(buckled) + user << "You cannot grab [src], they're buckled in!" + if(!G) //the grab will delete itself in New if affecting is anchored + return + user.put_in_active_hand(G) + G.synch() + LAssailant = user + user.do_attack_animation(src) + playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + visible_message("[user] has grabbed [src] passively!") - user.do_attack_animation(src) - playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) - visible_message("[user] has grabbed [src] passively!") - //End Chompstation edit - else - visible_message("[user.name] boops [src] on the head.") - close_up() + else + visible_message("[user.name] boops [src] on the head.") + close_up() +//End Chompstation edit //I'm not sure how much of this is necessary, but I would rather avoid issues. /mob/living/silicon/pai/proc/close_up()