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

Lick/smell verbs can now be used on held mobs. (#6751)

Browse Source
This commit is contained in:
Verkister
2023-08-10 15:28:42 +03:00
committed by GitHub
parent d99fc55c42
commit c60c2c564f
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/_helpers/mobs.dm
View File

@@ -232,7 +232,7 @@ Proc for attack log creation, because really why not
if(target?.flags & IS_BUSY) if(target?.flags & IS_BUSY)
to_chat(user, "<span class='warning'>Someone is already doing something with \the [target].</span>") to_chat(user, "<span class='warning'>Someone is already doing something with \the [target].</span>")
return FALSE return FALSE
var/atom/target_loc = null var/atom/target_loc = null
if(target) if(target)
target_loc = target.loc target_loc = target.loc
@@ -256,7 +256,7 @@ Proc for attack log creation, because really why not
if(exclusive & TASK_USER_EXCLUSIVE) if(exclusive & TASK_USER_EXCLUSIVE)
user.status_flags |= DOING_TASK user.status_flags |= DOING_TASK
if(target && (exclusive & TASK_TARGET_EXCLUSIVE)) if(target && (exclusive & TASK_TARGET_EXCLUSIVE))
target.flags |= IS_BUSY target.flags |= IS_BUSY
@@ -304,12 +304,17 @@ Proc for attack log creation, because really why not
if(progbar) if(progbar)
qdel(progbar) qdel(progbar)
/atom/proc/living_mobs(var/range = world.view) /atom/proc/living_mobs(var/range = world.view, var/count_held = FALSE) //CHOMPEdit Start
var/list/viewers = oviewers(src,range) var/list/viewers = oviewers(src,range)
if(count_held)
viewers = viewers(src,range)
var/list/living = list() var/list/living = list()
for(var/mob/living/L in viewers) for(var/mob/living/L in viewers)
living += L living += L
if(count_held)
for(var/obj/item/weapon/holder/H in L.contents)
if(istype(H.held_mob, /mob/living))
living += H.held_mob //CHOMPEdit End
return living return living
/atom/proc/human_mobs(var/range = world.view) /atom/proc/human_mobs(var/range = world.view)

15
code/modules/vore/eating/living_vr.dm
View File

@@ -417,7 +417,7 @@
// //
// Clearly super important. Obviously. // Clearly super important. Obviously.
// //
/mob/living/proc/lick(mob/living/tasted in living_mobs(1)) /mob/living/proc/lick(mob/living/tasted in living_mobs(1, TRUE)) //CHOMPEdit
set name = "Lick" set name = "Lick"
set category = "IC" set category = "IC"
set desc = "Lick someone nearby!" set desc = "Lick someone nearby!"
@@ -430,8 +430,10 @@
return return
setClickCooldown(DEFAULT_ATTACK_COOLDOWN) setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(tasted == src) //CHOMPEdit Start
visible_message("<span class='warning'>[src] licks [tasted]!</span>","<span class='notice'>You lick [tasted]. They taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>") visible_message("<span class='warning'>[src] licks themself!</span>","<span class='notice'>You lick yourself. You taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>")
else
visible_message("<span class='warning'>[src] licks [tasted]!</span>","<span class='notice'>You lick [tasted]. They taste rather like [tasted.get_taste_message()].</span>","<b>Slurp!</b>") //CHOMPEdit End
/mob/living/proc/get_taste_message(allow_generic = 1) /mob/living/proc/get_taste_message(allow_generic = 1)
@@ -458,7 +460,7 @@
//This is just the above proc but switched about. //This is just the above proc but switched about.
/mob/living/proc/smell(mob/living/smelled in living_mobs(1)) /mob/living/proc/smell(mob/living/smelled in living_mobs(1, TRUE)) //CHOMPEdit
set name = "Smell" set name = "Smell"
set category = "IC" set category = "IC"
set desc = "Smell someone nearby!" set desc = "Smell someone nearby!"
@@ -470,7 +472,10 @@
return return
setClickCooldown(DEFAULT_ATTACK_COOLDOWN) setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
visible_message("<span class='warning'>[src] smells [smelled]!</span>","<span class='notice'>You smell [smelled]. They smell like [smelled.get_smell_message()].</span>","<b>Sniff!</b>") if(smelled == src) //CHOMPEdit Start
visible_message("<span class='warning'>[src] smells themself!</span>","<span class='notice'>You smell yourself. You smell like [smelled.get_smell_message()].</span>","<b>Sniff!</b>")
else
visible_message("<span class='warning'>[src] smells [smelled]!</span>","<span class='notice'>You smell [smelled]. They smell like [smelled.get_smell_message()].</span>","<b>Sniff!</b>") //CHOMPEdit End
/mob/living/proc/get_smell_message(allow_generic = 1) /mob/living/proc/get_smell_message(allow_generic = 1)
if(!vore_smell && !allow_generic) if(!vore_smell && !allow_generic)