mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Standardize FAT
Conflicts: code/modules/client/preferences.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/silicon/robot/robot.dm code/modules/mob/living/simple_animal/constructs.dm code/modules/mob/mob.dm code/modules/mob/mob_grab.dm
This commit is contained in:
@@ -190,7 +190,7 @@
|
||||
s_click(hud)
|
||||
return
|
||||
if(M == assailant && state >= GRAB_AGGRESSIVE)
|
||||
if( (ishuman(user) && (FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) )
|
||||
if( (ishuman(user) && (M_FAT in user.mutations) && iscarbon(affecting) ) || ( isalien(user) && iscarbon(affecting) ) || ( istype(user,/mob/living/carbon/human/kidan) && istype(affecting,/mob/living/carbon/monkey/diona) ) )
|
||||
var/mob/living/carbon/attacker = user
|
||||
user.visible_message("<span class='danger'>[user] is attempting to devour [affecting]!</span>")
|
||||
if(istype(user, /mob/living/carbon/alien/humanoid/hunter))
|
||||
|
||||
Reference in New Issue
Block a user