diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm index d733b7b6e78..1459d00a39e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm @@ -67,7 +67,7 @@ if(TRUE) if(bag_state == "deflated") - fold() + fold(user) to_chat(user, span_notice("The sleeping bag now is [bag_fold? "folded." : "unfolded."]")) update_icon() update_icon_state() @@ -131,7 +131,7 @@ else to_chat(affected_human, span_notice("You need to unfold the bag before inflating it!")) -/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/proc/fold(mob/user, src) +/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/proc/fold(mob/user) bag_fold = !bag_fold conditional_pref_sound(user, 'modular_skyrat/modules/modular_items/lewd_items/sounds/latex.ogg', 40, TRUE) if(bag_fold == TRUE) diff --git a/modular_zubbers/code/datums/components/vore/vore.dm b/modular_zubbers/code/datums/components/vore/vore.dm index fdee477e9b2..b252377a8ab 100644 --- a/modular_zubbers/code/datums/components/vore/vore.dm +++ b/modular_zubbers/code/datums/components/vore/vore.dm @@ -30,9 +30,9 @@ return TRUE return ..() -/datum/action/innate/vore_mode/do_ability(mob/living/caller, atom/clicked_on) +/datum/action/innate/vore_mode/do_ability(mob/living/clicker, atom/clicked_on) var/datum/component/vore/V = target - return V.on_voremode_click(caller, clicked_on) + return V.on_voremode_click(clicker, clicked_on) /datum/action/innate/vore_mode/create_button() var/atom/movable/screen/movable/action_button/button = ..() diff --git a/modular_zubbers/modules/taur_mechanics/constrict.dm b/modular_zubbers/modules/taur_mechanics/constrict.dm index 936d7aab08a..235b275d494 100644 --- a/modular_zubbers/modules/taur_mechanics/constrict.dm +++ b/modular_zubbers/modules/taur_mechanics/constrict.dm @@ -37,7 +37,7 @@ return FALSE return TRUE -/datum/action/innate/constrict/do_ability(mob/living/caller, atom/clicked_on) +/datum/action/innate/constrict/do_ability(mob/living/clicker, atom/clicked_on) if (!isliving(clicked_on)) if (tail) qdel(tail) @@ -48,19 +48,19 @@ var/mob/living/living_target = clicked_on - if (living_target == caller) + if (living_target == clicker) return TRUE if (!can_coil_target(living_target)) return TRUE - caller.balloon_alert_to_viewers("starts coiling tail") - caller.visible_message(span_warning("[caller] starts coiling [caller.p_their()] tail around [living_target]..."), span_notice("You start coiling your tail around [living_target]..."), ignored_mobs = list(living_target)) - to_chat(living_target, span_userdanger("[caller] starts coiling [caller.p_their()] tail around you!")) + clicker.balloon_alert_to_viewers("starts coiling tail") + clicker.visible_message(span_warning("[clicker] starts coiling [clicker.p_their()] tail around [living_target]..."), span_notice("You start coiling your tail around [living_target]..."), ignored_mobs = list(living_target)) + to_chat(living_target, span_userdanger("[clicker] starts coiling [clicker.p_their()] tail around you!")) owner.changeNext_move(base_coil_delay) // prevent interaction during this unset_ranged_ability(owner) // because we sleep - var/result = do_after(caller, base_coil_delay, living_target, IGNORE_HELD_ITEM, extra_checks = CALLBACK(src, PROC_REF(can_coil_target), living_target)) + var/result = do_after(clicker, base_coil_delay, living_target, IGNORE_HELD_ITEM, extra_checks = CALLBACK(src, PROC_REF(can_coil_target), living_target)) owner.changeNext_move(-base_coil_delay) if (!result) return TRUE