Skip to content

Commit

Permalink
requested changes...
Browse files Browse the repository at this point in the history
  • Loading branch information
SandPoot committed Sep 8, 2024
1 parent cf38c1a commit a581827
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
11 changes: 6 additions & 5 deletions modular_zubbers/code/datums/components/vore/vore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
pred.visible_message(span_danger("[pred] is attempting to [lowertext(selected_belly.insert_verb)] [prey] into their [lowertext(selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable)
if(!do_after(pred, VORE_DELAY, prey))
return
if(!check_vore_grab(pred) || !check_vore_preferences(parent, pred, prey, assume_active_consent = TRUE))
if((!check_vore_grab(pred) && !istype(prey.loc, /obj/item/clothing/head/mob_holder)) || !check_vore_preferences(parent, pred, prey, assume_active_consent = TRUE))
return
#endif
pred.visible_message(span_danger("[pred] manages to [lowertext(selected_belly.insert_verb)] [prey] into their [lowertext(selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable)
Expand All @@ -409,14 +409,15 @@
prey.visible_message(span_danger("[prey] manages to make [pred] [lowertext(pred_component.selected_belly.insert_verb)] [prey] into their [lowertext(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable)
pred_component.complete_vore(prey)

/datum/component/vore/proc/feed_other_to_other(mob/living/pred)
/datum/component/vore/proc/feed_other_to_other(mob/living/pred, mob/living/prey)
var/mob/living/feeder = parent
if(!check_vore_grab(feeder))
if(!prey)
prey = feeder.pulling
if(!check_vore_grab(feeder) && !istype(prey.loc, /obj/item/clothing/head/mob_holder))
to_chat(feeder, span_danger("You must have a[ishuman(feeder) ? "n aggressive" : ""] grab to feed someone to someone else."))
return
if(!feeder.can_perform_action(pred, pred.interaction_flags_click | FORBID_TELEKINESIS_REACH))
return
var/mob/living/prey = feeder.pulling
if(!check_vore_preferences(feeder, pred, prey))
return
// check_vore_preferences asserts this exists
Expand All @@ -425,7 +426,7 @@
feeder.visible_message(span_danger("[feeder] is attempting to make [pred] [lowertext(pred_component.selected_belly.insert_verb)] [prey] into their [lowertext(pred_component.selected_belly.name)]!"), pref_to_check = /datum/preference/toggle/erp/vore_enable)
if(!do_after(feeder, VORE_DELAY, pred))
return
if(!check_vore_grab(feeder) || !check_vore_preferences(feeder, pred, prey, assume_active_consent = TRUE))
if((!check_vore_grab(pred) && !istype(prey.loc, /obj/item/clothing/head/mob_holder)) || !check_vore_preferences(feeder, pred, prey, assume_active_consent = TRUE))
return
if(!feeder.can_perform_action(pred, pred.interaction_flags_click | FORBID_TELEKINESIS_REACH))
return
Expand Down
16 changes: 12 additions & 4 deletions modular_zzplurt/code/datums/elements/holder_micro.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,14 @@
ignore_abstract = TRUE // it didn't help still
item_flags = INEDIBLE_CLOTHING

/obj/item/clothing/head/mob_holder/micro/Initialize(mapload, mob/living/M, worn_state, head_icon, lh_icon, rh_icon, worn_slot_flags)
. = ..()
RegisterSignals(src, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_POST_UNEQUIP), PROC_REF(update_visuals))

/obj/item/clothing/head/mob_holder/micro/Destroy()
UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_POST_EQUIPPED))
return ..()

/obj/item/clothing/head/mob_holder/micro/container_resist_act(mob/living/resisting)
if(resisting.incapacitated())
to_chat(resisting, span_warning("You can't escape while you're restrained like this!"))
Expand Down Expand Up @@ -185,12 +193,12 @@
/obj/item/clothing/head/mob_holder/micro/attack(mob/living/eater, mob/living/holder)
var/datum/component/vore/vore = holder.GetComponent(/datum/component/vore)
if(!vore)
return FALSE
return ..()

if(holder == eater) // Parent wants to eat pulled
. = vore.vore_other(held_mob)
return
return ..()
vore.vore_other(held_mob)
else
vore.feed_other_to_other(eater, held_mob)

/obj/item/clothing/head/mob_holder/micro/Exited(mob/living/totally_not_vored, direction)
// Transferred to a belly? Get rid of this before it puts us on the floor
Expand Down

0 comments on commit a581827

Please sign in to comment.