cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Anti-Pref Break

Browse Source
This commit is contained in:
Shadow Quill
2020-09-12 19:16:35 -05:00
parent f260261325
commit 680fb39881
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
View File

@@ -95,7 +95,7 @@
var/list/potentials = living_mobs(0) var/list/potentials = living_mobs(0)
if(potentials.len) if(potentials.len)
var/mob/living/target = pick(potentials) var/mob/living/target = pick(potentials)
if(istype(target) && vore_selected) if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected)
target.forceMove(vore_selected) target.forceMove(vore_selected)
to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>") to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")

2
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
View File

@@ -257,7 +257,7 @@
var/list/potentials = living_mobs(0) var/list/potentials = living_mobs(0)
if(potentials.len) if(potentials.len)
var/mob/living/target = pick(potentials) var/mob/living/target = pick(potentials)
if(istype(target) && vore_selected) if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected)
if(target.buckled) if(target.buckled)
target.buckled.unbuckle_mob(target, force = TRUE) target.buckled.unbuckle_mob(target, force = TRUE)
target.forceMove(vore_selected) target.forceMove(vore_selected)

4
code/modules/mob/living/simple_mob/subtypes/vore/demon/demon_abilities.dm
View File

@@ -56,7 +56,7 @@
var/list/potentials = living_mobs(0) var/list/potentials = living_mobs(0)
if(potentials.len) if(potentials.len)
var/mob/living/target = pick(potentials) var/mob/living/target = pick(potentials)
if(istype(target) && vore_selected) if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected)
target.forceMove(vore_selected) target.forceMove(vore_selected)
to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>") to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")
@@ -203,7 +203,7 @@
var/list/potentials = living_mobs(0) var/list/potentials = living_mobs(0)
if(potentials.len) if(potentials.len)
var/mob/living/target = pick(potentials) var/mob/living/target = pick(potentials)
if(istype(target) && vore_selected) if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected)
target.forceMove(vore_selected) target.forceMove(vore_selected)
to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>") to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")

2
code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm
View File

@@ -44,7 +44,7 @@
var/list/potentials = living_mobs(0) var/list/potentials = living_mobs(0)
if(potentials.len) if(potentials.len)
var/mob/living/target = pick(potentials) var/mob/living/target = pick(potentials)
if(istype(target) && vore_selected) if(target.devourable && target.can_be_drop_prey && istype(target) && vore_selected)
target.forceMove(vore_selected) target.forceMove(vore_selected)
to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>") to_chat(target,"<span class='warning'>\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")