From 2a33f334876e8c06f5ffbd902acddee4559655ab Mon Sep 17 00:00:00 2001
From: mirrormagic1 <ryancat12322@gmail.com>
Date: Sun, 24 Apr 2022 18:38:35 -0400
Subject: [PATCH] Killer dildo addition

Added a killer dildo, Will kill you if you suicide with it twice. Does 100 brute, 20 oxy dmg, and stuns for 400 ticks.
item id: "obj/item/dildo/flared/killer"

Added the killer dildo sprite "dildo_flared_6"
---
 .../code/modules/arousal/toys/dildos.dm       |  21 +++++++++++++++++-
 modular_citadel/icons/obj/genitals/dildo.dmi  | Bin 1056 -> 1151 bytes
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/modular_citadel/code/modules/arousal/toys/dildos.dm b/modular_citadel/code/modules/arousal/toys/dildos.dm
index 17d77071..f67e8584 100644
--- a/modular_citadel/code/modules/arousal/toys/dildos.dm
+++ b/modular_citadel/code/modules/arousal/toys/dildos.dm
@@ -129,6 +129,13 @@ obj/item/dildo/flared/gigantic
 	desc 				= "You can barely carry this thing! Meant for... \"advanced\" interrogation techniques."
 	dildo_size 			= 5
 	attack_verb 		= list("penetrated", "slapped", "gaped", "prolapsed", "inseminated", "destroyed", "broke", "demolished", "whacked")
+//killerdildokillerdildo
+obj/item/dildo/flared/killer
+	name 				= "bitch killer"
+	desc 				= "The fact you're able to carry this is insane. Initally made to be used as a new death penalty, Using this will definitely kill you."
+	dildo_size 			= 6
+	attack_verb 		= list("penetrated", "beat", "gaped", "prolapsed", "destroyed", "broke", "demolished", "whacked", "bruised", "tore")
+
 
 obj/item/dildo/custom
 	name 				= "customizable dildo"
@@ -138,6 +145,7 @@ obj/item/dildo/custom
 	random_shape 		= TRUE
 	random_size 		= TRUE
 
+
 // Suicide acts, by request
 
 /obj/item/dildo/proc/manual_suicide(mob/living/user)
@@ -173,4 +181,15 @@ obj/item/dildo/custom
 		user.adjust_eye_damage(20)
 		user.adjustOxyLoss(15)
 	return MANUAL_SUICIDE
-
+// Two tries, then you're dead bud.
+/obj/item/dildo/flared/killer/suicide_act(mob/living/user)
+	if(do_after(user,45,target=src))
+		user.visible_message("<span class='suicide'>[user] screams in pain as they insert the [src] into their ass! WHY WOULD THEY DO THAT? It looks like [user.p_theyre()] trying to commit suicide!!</span>")
+		playsound(loc, 'sound/voice/scream/scream_r.ogg', 50, 2, -1)
+		playsound(loc, 'sound/lewd/champ_fingering.ogg', 50, 2, -1)
+		playsound(loc, 'sound/effects/gib_step.ogg', 50, 2, -1)
+		user.Stun(400)
+		user.adjust_blurriness(24)
+		user.adjustBruteLoss(100)
+		user.adjustOxyLoss(20)
+	return MANUAL_SUICIDE
\ No newline at end of file
diff --git a/modular_citadel/icons/obj/genitals/dildo.dmi b/modular_citadel/icons/obj/genitals/dildo.dmi
index d383298b2ef20588566ffbec4d2767cf2be7a1a0..024bc0477ddd03070c439ee189614b44bec505b3 100644
GIT binary patch
delta 1060
zcmV+<1l#+d2>%F>YJbRjR9JLGWpiV4X>fFDZ*Bkpc$}q^O%B2!5JuN<3es*H(?5+H
zH>Qp0!d{^vfeNuL4UBqytGF|mQFk-p@#W1BVz#djP0OldL$A_0Z6>y3<tnA*rUj^_
zDRN4b)F%bLalk<?WhC?<On06PfD~O8Q6jW;%SlE_Z}}*F9e?2SFZlw=tINnIw2h~+
zE}jmW5M{v4=CP-3lBLPp{dwRT@8)T&o2P$w>j!Q>JtH<C=!*^bdxY}efHiXEFMJci
zV^+7-^K0D!`PlvxzfqF(0009lNkl<ZXo2mSv2Gec5QcqIAy)<@+}gWmsC|10b<AF<
zBXO?MB$3X29Dn21CA@(VFOV{2X!8huqCm(0Z?u!u#c>od-48q8&dve<9Cvhdh~JH@
zEx?|%%a_Z`mVoL_V#c`wI6qT%e1&IbfZTj+2gv$VVo<UMXg(+jtUVo}p{o)klnP+{
z+yGPJ0%08ha7S?tKfA^mT=1Fz*1-!>71e%%lvf@WWPc2}DBeW@el~+9WQMMLUcmd}
z3m*maCll&&7q!J5q@3Up^4l+%&?z2JJJhBqAR(W40z5uM_4Z7lvu+pk(bx4lsymAX
z=;eBiJ7|%daEL?vFCo2_fZ_ZsE#aKjcZ;-%B5>P5lLiRfcK9g~z;0`A;{Z7$&2Fm!
zMxP15UVo<osAnpGOI87W0&vMXfUW{34F5QQ?Yi&M0D<2#fD-}$`Tf@W(EKz2`@Qug
zzMuiv@AIniX#n#35b%Qlq}lI-BP`M0LrwNA)<Rd0mz!@f9Yklf`5s+xh(r9NAx|v<
zqf|Q&0L@<pm?yG64L}Lf%*oCbK#<Vm35Ef^9)D>{IOPe309iA~pIuHEF<{6Q6!8SB
z0R}g50I&ZA0JWuxScgY&s4uQhqB^XgrV7kSREHH<)ZByI<NIn4cyi5W8h{d#0X;e+
zYdeYeAS+9_U6&I7g%M-u_I<H<0Kjy71qstJ{DTqL|JL6T;7bJf5&*#fa=culol`}u
z1AhQVXR~<(P4hx{gv8(pCOHlh%u9rrr*@ZZ(9F|rWqHRzRlQ9D@Q#C~Nvj|;1ys;8
z1^<dtko#u$cr$%^r&N%U`w9U@8i2hp9YF4z4j|)@F#@a#urCgv2_?M;!vFvy&JF+z
zf}nvxZV)h30W>fKfP1w9dVb*WyI`I6U4Ni~LF#L0;zj-5DFF0)afT`|i4{yem}`FT
zd8VPDfkCD-1l-kefEc|0Pp*L7R@?+866+@MCbHjeCz$<*CcBA-A4x<3Qu=cLp^Eie
z9UTbh2;%E%|FKTK)6tQH28IAo)m0q@(7?b)&@13D4!)jx4>*>q&Hmgc)>+raT^&2C
e)n@ffL(xwQ1myakDZ-)v0000<MNUMnLSTZbqw5g>

delta 964
zcmV;#13Ucx2%rd%YJbCeR9JLGWpiV4X>fFDZ*Bkpc$}q^O$x#=5JuO@DMGs~(m%nC
zo6;g(*ejGkQWI>Ol8kzNt6559w7VJd^6`>kVpcV$wqy0VrFUtaHZwc2a+gx_&;r!j
z6geeI>Wc#3IN%`HG7@?eroYYxK#D$#C=uGa^(3QYuzZrf4uA0Zk9>jT)otQ4+Q!pZ
z7f%OGh%(?7^ZKVllBLPV{bl4D@8)T&o2UPG8%A!wjS(9V^u-2jenPo5U>^#IS<}_;
zU3mgdb?^wz1wv~800PoUL_t(&f$f>Ujv6r##@VURRs4}i3-%t=w{}7u)+_2raD5VK
z>2ncjDd7$7#D5E<Oc~ld0#6jm%r|#-Mw|cH=|1rMJoW<L7<W2td~ak;0k+pHpKfj%
z0;-qFj7b7887F3Z&ex0p+PrB7$c9j&C^-eFUnde!2UtQ4Pemm71YrKN0mkzIgjxXj
zjN}~u>>6kIfENI;j=extQGJ_0ei7J!3<1~0t0*9>R)1_0G6T;&FWCDOiVy`1%My0E
z&$Z<<kT3ZX^1Jsup<C>@c3hjHU<r8{0C2yH>dTs#&iZ|(J0Fk7sP69fOdpO%K0_+h
z32n6TuLKPm0;b!sE@1-W`-QHf5N<oFbpYYE)3-_hx~;v71858y-8Kc7y#oMxT@nC$
zmIPqQNq@i)09bMw08arErav5jc0F`Dfbe?+V1fXE-(S3sn_mimes6>4FQfqI_jy$X
z9RU1Z0=@tMH2S?*!hzen)L`FaE!)+r!|78@i|9U_K1T<%(Z(MdbZ!WkY3*D9>R${n
zXRy8$01~L)f}JM-B4L0X3<3rN(2(#9I~V|D^?#QC>|(+U0aL7?h$q+-V6=$?aQq_x
zt}RrAS}wtHeSO=DYFWV=DlomMmK9j8aS!sq-%suVcCPs<1%L!KU;t}GZOix`WZtvm
zI(hyt3>gE*_x*my0L%G;B`oLc9}Hpt7k}q~;5i_81`rL%)#1qP94bOB02tlV>7Hrm
z7k}gulz|<LI@%8A{|GYYW*?MMy;UBbAu>}aD**S+KHy<GH6yq$X#wbkdH}eu9stHc
zb1lIBb^vrJ`aPHmK;jYw0~!X}XaUeL=mF3$kkft_pkbi(t#T8=@5$i>g0_NXSUfTE
ziGYTImMa~A3_t&?D?qm;SL!Yp(eE!EOg&%qn+O2%!3R|dumlS0ieKxb0vZNA02&7U
m5-^Mt{k$#?52wH8R^}@NW4o}V)za4h0000<MNUMnLSTZcys~Kk