Pacifists can nom things now, but not feed to others
This commit is contained in:
@@ -124,6 +124,18 @@
|
|||||||
if(user == anchored || !isturf(user.loc))
|
if(user == anchored || !isturf(user.loc))
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
|
//pacifist vore check.
|
||||||
|
if(user.pulling && HAS_TRAIT(user, TRAIT_PACIFISM) && user.voremode) //they can only do heals, noisy guts, absorbing (technically not harm)
|
||||||
|
if(ismob(user.pulling))
|
||||||
|
var/mob/P = user.pulling
|
||||||
|
if(src != user)
|
||||||
|
to_chat(user, "<span class='notice'>You can't risk digestion!</span>")
|
||||||
|
return FALSE
|
||||||
|
else
|
||||||
|
user.vore_attack(user, P, user)
|
||||||
|
return
|
||||||
|
|
||||||
|
//normal vore check.
|
||||||
if(user.pulling && user.grab_state == GRAB_AGGRESSIVE && user.voremode)
|
if(user.pulling && user.grab_state == GRAB_AGGRESSIVE && user.voremode)
|
||||||
if(ismob(user.pulling))
|
if(ismob(user.pulling))
|
||||||
var/mob/P = user.pulling
|
var/mob/P = user.pulling
|
||||||
|
|||||||
@@ -49,13 +49,16 @@
|
|||||||
var/sound/pred_death = sound(get_sfx("death_pred"))
|
var/sound/pred_death = sound(get_sfx("death_pred"))
|
||||||
var/turf/source = get_turf(owner)
|
var/turf/source = get_turf(owner)
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////// DM_HOLD /////////////////////////////
|
///////////////////////////// DM_HOLD /////////////////////////////
|
||||||
if(digest_mode == DM_HOLD)
|
if(digest_mode == DM_HOLD)
|
||||||
return SSBELLIES_PROCESSED
|
return SSBELLIES_PROCESSED
|
||||||
|
|
||||||
//////////////////////////// DM_DIGEST ////////////////////////////
|
//////////////////////////// DM_DIGEST ////////////////////////////
|
||||||
else if(digest_mode == DM_DIGEST)
|
else if(digest_mode == DM_DIGEST)
|
||||||
|
if(HAS_TRAIT(owner, TRAIT_PACIFISM)) //obvious.
|
||||||
|
digest_mode = DM_NOISY
|
||||||
|
return
|
||||||
|
|
||||||
for (var/mob/living/M in contents)
|
for (var/mob/living/M in contents)
|
||||||
if(prob(25))
|
if(prob(25))
|
||||||
if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
|
if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
|
||||||
@@ -210,6 +213,10 @@
|
|||||||
//////////////////////////DM_DRAGON /////////////////////////////////////
|
//////////////////////////DM_DRAGON /////////////////////////////////////
|
||||||
//because dragons need snowflake guts
|
//because dragons need snowflake guts
|
||||||
if(digest_mode == DM_DRAGON)
|
if(digest_mode == DM_DRAGON)
|
||||||
|
if(HAS_TRAIT(owner, TRAIT_PACIFISM)) //imagine var editing this when you're a pacifist. smh
|
||||||
|
digest_mode = DM_NOISY
|
||||||
|
return
|
||||||
|
|
||||||
for (var/mob/living/M in contents)
|
for (var/mob/living/M in contents)
|
||||||
if(prob(55)) //if you're hearing this, you're a vore ho anyway.
|
if(prob(55)) //if you're hearing this, you're a vore ho anyway.
|
||||||
if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
|
if((world.time - NORMIE_HEARCHECK) > last_hearcheck)
|
||||||
|
|||||||
Reference in New Issue
Block a user