From 18d2572e57b01b5358f27753942c21629a70fb15 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Sat, 12 Jan 2019 02:31:25 -0500 Subject: [PATCH] Code Improvements (again) Knowing what I know now makes me wanna go revamp every instance of suicide code but geez. --- .../code/modules/arousal/toys/dildos.dm | 63 ++++++++----------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/modular_citadel/code/modules/arousal/toys/dildos.dm b/modular_citadel/code/modules/arousal/toys/dildos.dm index 87cc7a73c2..f69b0b1935 100644 --- a/modular_citadel/code/modules/arousal/toys/dildos.dm +++ b/modular_citadel/code/modules/arousal/toys/dildos.dm @@ -105,7 +105,7 @@ /obj/item/dildo/knotted dildo_shape = "knotted" name = "knotted dildo" - attack_verb = list("penetrated", "knotted", "slapped", "inseminated") + attack_verb = list("penetrated", "knotted", "slapped", "inseminated") obj/item/dildo/human dildo_shape = "human" @@ -115,17 +115,18 @@ obj/item/dildo/human obj/item/dildo/plain dildo_shape = "plain" name = "plain dildo" - attack_verb = list("penetrated", "slapped", "inseminated") + attack_verb = list("penetrated", "slapped", "inseminated") obj/item/dildo/flared dildo_shape = "flared" name = "flared dildo" - attack_verb = list("penetrated", "slapped", "neighed", "gaped", "prolapsed", "inseminated") + attack_verb = list("penetrated", "slapped", "neighed", "gaped", "prolapsed", "inseminated") obj/item/dildo/flared/huge - name = "literal horse cock" - desc = "THIS THING IS HUGE!" - dildo_size = 4 + dildo_shape ="horse" + name = "literal horse cock" + desc = "THIS THING IS HUGE!" + dildo_size = 4 obj/item/dildo/custom name = "customizable dildo" @@ -137,43 +138,29 @@ obj/item/dildo/custom // Suicide acts, by request +var/is_knotted = (dildo_shape == knotted) ? "They swallowed the knot" : "Their face is turning blue" +var/is_horse = (dildo_shape == horse ) ? " + /obj/item/dildo/proc/manual_suicide(mob/living/user) - user.visible_message("[user] finally finishes deepthroating the [src], and their life.") - user.adjustOxyLoss(200) - user.death(0) + user.visible_message("[user] finally finishes deepthroating the [src], and their life.") + 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) - user.Stun(150) - user.adjust_blurriness(8) - user.adjust_eye_damage(10) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 15) + if(do_after(user,17,target=src)) + user.visible_message("[user] tears-up and gags as they shove [src] down their throat! [is_knotted]! 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) 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) - user.Stun(300) - user.adjust_blurriness(8) - user.adjust_eye_damage(15) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 22) + if(do_after(user,35,target=src)) + 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) + user.Stun(300) + user.adjust_blurriness(8) + user.adjust_eye_damage(15) return MANUAL_SUICIDE -/obj/item/dildo/flared/custom/suicide_act(mob/living/user) - user.visible_message("[user] gags as they shove [src] down their throat! It looks like they wanted a custom death message!!") - playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1) - user.Stun(50) - user.adjust_blurriness(8) - user.adjust_eye_damage(10) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 5) - return MANUAL_SUICIDE