From 77a28abccf80daf8ffa39c774ca39163007fd632 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 9 Jan 2019 22:07:11 -0500 Subject: [PATCH] Code improvements Thanks to @Ghommie for the suggestion. --- .../code/modules/arousal/toys/dildos.dm | 36 +++++-------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/modular_citadel/code/modules/arousal/toys/dildos.dm b/modular_citadel/code/modules/arousal/toys/dildos.dm index 0f73564cad..87cc7a73c2 100644 --- a/modular_citadel/code/modules/arousal/toys/dildos.dm +++ b/modular_citadel/code/modules/arousal/toys/dildos.dm @@ -142,6 +142,15 @@ obj/item/dildo/custom user.adjustOxyLoss(200) user.death(0) +/obj/item/dildo/suicide_act(mob/living/user) + user.visible_message("[user] tears-up and gags as they shove [src] down their throat! Their face is turning blue! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1) + user.Stun(150) + user.adjust_blurriness(8) + user.adjust_eye_damage(10) + addtimer(CALLBACK(src, .proc/manual_suicide, user), 15) + return MANUAL_SUICIDE + /obj/item/dildo/knotted/suicide_act(mob/living/user) user.visible_message("[user] tears-up and gags as they shove [src] down their throat! They swallowed the knot! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1) @@ -151,33 +160,6 @@ obj/item/dildo/custom addtimer(CALLBACK(src, .proc/manual_suicide, user), 15) return MANUAL_SUICIDE -/obj/item/dildo/human/suicide_act(mob/living/user) - user.visible_message("[user] tears-up and gags as they shove [src] down their throat! Their face is turning blue! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1) - user.Stun(150) - user.adjust_blurriness(8) - user.adjust_eye_damage(10) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 15) - return MANUAL_SUICIDE - -/obj/item/dildo/plain/suicide_act(mob/living/user, delay = 150) - user.visible_message("[user] tears-up and gags as they shove [src] down their throat! Their face is turning blue! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1) - user.Stun(150) - user.adjust_blurriness(8) - user.adjust_eye_damage(10) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 15) - return MANUAL_SUICIDE - -/obj/item/dildo/flared/suicide_act(mob/living/user) - user.visible_message("[user] tears-up and gags as they shove [src] down their throat! Their face is turning blue! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1) - user.Stun(150) - user.adjust_blurriness(8) - user.adjust_eye_damage(10) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 15) - return MANUAL_SUICIDE - /obj/item/dildo/flared/huge/suicide_act(mob/living/user) user.visible_message("[user] tears-up and gags as they try to deepthroat the [src]! WHY WOULD THEY DO THAT? It looks like [user.p_theyre()] trying to commit suicide!!") playsound(loc, 'sound/weapons/gagging.ogg', 50, 2, -1)