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

[MIRROR] Adjustments (#6723)

Browse Source 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
CHOMPStation2
2023-08-05 15:54:41 -07:00
committed by GitHub
parent 8a8e8c5dbd
commit 6bac7350fd
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/ai/ai_holder_targeting_vr.dm
View File

@@ -20,6 +20,11 @@
/datum/ai_holder/simple_mob/vore/find_target(list/possible_targets, has_targets_list) /datum/ai_holder/simple_mob/vore/find_target(list/possible_targets, has_targets_list)
if(!vore_hostile) if(!vore_hostile)
return ..() return ..()
if(!isanimal(holder)) //Only simplemobs have the vars we need
return ..()
var/mob/living/simple_mob/H = holder
if(H.vore_fullness >= H.vore_capacity) //Don't beat people up if we're full
return ..()
ai_log("find_target() : Entered.", AI_LOG_TRACE) ai_log("find_target() : Entered.", AI_LOG_TRACE)
. = list() . = list()

4
code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
View File

@@ -1317,6 +1317,7 @@
return return
L.stop_pulling() L.stop_pulling()
L.Weaken(3) L.Weaken(3)
GLOB.prey_eaten_roundstat++
if(target.reciever) //We don't have to worry if(target.reciever) //We don't have to worry
AM.unbuckle_all_mobs(TRUE) AM.unbuckle_all_mobs(TRUE)
AM.forceMove(get_turf(target)) AM.forceMove(get_turf(target))
@@ -1333,6 +1334,7 @@
if(isobserver(AM)) if(isobserver(AM))
return return
playsound(src, teleport_sound, vol = 100, vary = 1, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) playsound(src, teleport_sound, vol = 100, vary = 1, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE)
playsound(target, teleport_sound, vol = 100, vary = 1, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE)
if(isliving(AM)) if(isliving(AM))
var/mob/living/L = AM var/mob/living/L = AM
if(teleport_message && L.client) if(teleport_message && L.client)
@@ -1375,6 +1377,7 @@
if(dog.client) if(dog.client)
to_chat(dog, "<span class='notice'>[I.thrower ? "\The [I.thrower]" : "Someone"] feeds \the [I] to you!</span>") to_chat(dog, "<span class='notice'>[I.thrower ? "\The [I.thrower]" : "Someone"] feeds \the [I] to you!</span>")
qdel(I) qdel(I)
GLOB.items_digested_roundstat++
/obj/effect/dog_teleporter/reciever /obj/effect/dog_teleporter/reciever
name = "exit" name = "exit"
@@ -1527,6 +1530,7 @@
how_much = how_much / 10 //Braindead mobs are worth less how_much = how_much / 10 //Braindead mobs are worth less
linked_mob.adjust_nutrition(how_much) linked_mob.adjust_nutrition(how_much)
H.mind?.vore_death = TRUE H.mind?.vore_death = TRUE
GLOB.prey_digested_roundstat++
spawn(0) spawn(0)
qdel(H) //glorp qdel(H) //glorp
return return

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

@@ -168,7 +168,7 @@
vore_ignores_undigestable = 0 vore_ignores_undigestable = 0
vore_default_mode = DM_SELECT vore_default_mode = DM_SELECT
vore_icons = SA_ICON_LIVING vore_icons = SA_ICON_LIVING
vore_stomach_name = "Stomach" vore_stomach_name = "stomach"
vore_default_item_mode = IM_DIGEST vore_default_item_mode = IM_DIGEST
vore_pounce_chance = 75 vore_pounce_chance = 75
vore_pounce_cooldown = 10 vore_pounce_cooldown = 10
@@ -191,7 +191,7 @@
/mob/living/simple_mob/vore/vore_hostile/leaper/init_vore() /mob/living/simple_mob/vore/vore_hostile/leaper/init_vore()
..() ..()
var/obj/belly/B = vore_selected var/obj/belly/B = vore_selected
B.name = "interior" B.name = "stomach"
B.desc = "The flesh of the tall creature's stomach folds over you in doughy waves, squeezing you into the tightest shape it can manage with idle flexes churning down on you. Your limbs often find themselves lost between folds and tugged this way or that, held in a skin tight press that is not painful, but is hard to pull away from. You can see a strange, glittering pink and purple light glimmering through the flesh of the monster all around you, like your very own sea of stars. The walls rush in to fill all the space, squeezing you from head to toe no matter how you might wiggle, the weight of the semi-transparent interior flesh keeping you neatly secured deep inside while wringing the fight out of you." B.desc = "The flesh of the tall creature's stomach folds over you in doughy waves, squeezing you into the tightest shape it can manage with idle flexes churning down on you. Your limbs often find themselves lost between folds and tugged this way or that, held in a skin tight press that is not painful, but is hard to pull away from. You can see a strange, glittering pink and purple light glimmering through the flesh of the monster all around you, like your very own sea of stars. The walls rush in to fill all the space, squeezing you from head to toe no matter how you might wiggle, the weight of the semi-transparent interior flesh keeping you neatly secured deep inside while wringing the fight out of you."
B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING
B.belly_fullscreen = "yet_another_tumby" B.belly_fullscreen = "yet_another_tumby"