shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code Improvements (again)

Browse Source 
Knowing what I know now makes me wanna go revamp every instance of suicide code but geez.
This commit is contained in:
Ragolution
2019-01-12 02:31:25 -05:00
parent 77a28abccf
commit 18d2572e57
1 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/toys/dildos.dm
+25 -38
View File
@@ -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("<span class='suicide'>[user] finally finishes deepthroating the [src], and their life.</span>")
user.adjustOxyLoss(200)
user.death(0)
user.visible_message("<span class='suicide'>[user] finally finishes deepthroating the [src], and their life.</span>")
user.adjustOxyLoss(200)
user.death(0)
/obj/item/dildo/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[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!</span>")
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("<span class='suicide'>[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!</span>")
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("<span class='suicide'>[user] tears-up and gags as they shove [src] down their throat! [is_knotted]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
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("<span class='suicide'>[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!!</span>")
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("<span class='suicide'>[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!!</span>")
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("<span class='suicide'>[user] gags as they shove [src] down their throat! It looks like they wanted a custom death message!!</span>")
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