diff --git a/code/_helpers/mobs_vr.dm b/code/_helpers/mobs_vr.dm new file mode 100644 index 0000000000..602a2ed6ce --- /dev/null +++ b/code/_helpers/mobs_vr.dm @@ -0,0 +1,7 @@ +/atom/proc/living_mobs(var/range = world.view) + var/list/viewers = oviewers(src,range) + var/list/living = list() + for(var/mob/living/L in viewers) + living += L + + return living diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index df8d0f6301..6bf2f77c0d 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -7,7 +7,7 @@ var/leap_at var/dogborg = FALSE -/mob/living/silicon/robot/verb/robot_nom(var/mob/living/T in oview(1)) +/mob/living/silicon/robot/verb/robot_nom(var/mob/living/T in living_mobs(1)) set name = "Robot Nom" set category = "IC" set desc = "Allows you to eat someone." diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 449860dbd0..7c4d5004f1 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -271,7 +271,7 @@ // // Clearly super important. Obviously. // -/mob/living/proc/lick(var/mob/living/tasted in oview(1)) +/mob/living/proc/lick(var/mob/living/tasted in living_mobs(1)) set name = "Lick Someone" set category = "IC" set desc = "Lick someone nearby!" @@ -279,12 +279,12 @@ if(!istype(tasted)) return - if(!src.canClick() || incapacitated(INCAPACITATION_ALL)) + if(!canClick() || incapacitated(INCAPACITATION_ALL)) return - src.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - src.visible_message("[src] licks [tasted]!","You lick [tasted]. They taste rather like [tasted.get_taste_message()].","Slurp!") + visible_message("[src] licks [tasted]!","You lick [tasted]. They taste rather like [tasted.get_taste_message()].","Slurp!") /mob/living/proc/get_taste_message(allow_generic = 1) diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm index 22ea12441c..319592c5ea 100644 --- a/code/modules/vore/eating/simple_animal_vr.dm +++ b/code/modules/vore/eating/simple_animal_vr.dm @@ -6,7 +6,7 @@ // // Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs. // -/mob/living/proc/animal_nom(var/mob/living/T in oview(1)) +/mob/living/proc/animal_nom(var/mob/living/T in living_mobs(1)) set name = "Animal Nom" set category = "IC" set desc = "Since you can't grab, you get a verb!" diff --git a/vorestation.dme b/vorestation.dme index a7afc4a1c6..ba81030f30 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -78,6 +78,7 @@ #include "code\_helpers\maths.dm" #include "code\_helpers\matrices.dm" #include "code\_helpers\mobs.dm" +#include "code\_helpers\mobs_vr.dm" #include "code\_helpers\names.dm" #include "code\_helpers\sanitize_values.dm" #include "code\_helpers\storage.dm"