cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 23:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes more merge conflict fuckery

Browse Source
This commit is contained in:
Unknown
2020-09-05 00:23:39 -05:00
parent 79a1167f2d
commit 62cf36ddea
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/arousal/toys/dildos.dm
-7
View File
@@ -168,20 +168,13 @@ obj/item/dildo/custom
user.adjust_eye_damage(15)
return MANUAL_SUICIDE
<<<<<<< HEAD
/obj/item/dildo/flared/gigantic/suicide_act(mob/living/user)
=======
/obj/item/dildo/flared/huge/suicide_act(mob/living/user)
>>>>>>> slaveImplant
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(600)
user.adjust_blurriness(16)
user.adjust_eye_damage(30)
<<<<<<< HEAD
user.adjustOxyLoss(15)
=======
>>>>>>> slaveImplant
return MANUAL_SUICIDE