cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Soap stops swearing (#20162)

Browse Source 
* technically functional

* technically functional

* more logically coded, credit to Contra and Mira

* yes this is more logical

* Sean and Fox reviews

* webeditor heresy
This commit is contained in:
Coolrune206
2023-01-18 11:32:28 -05:00
committed by GitHub
parent 802408a923
commit bf4212d24a
5 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/soap.dm
+7 -1
View File
@@ -22,6 +22,8 @@
/obj/item/soap/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return
if(user.zone_selected == "mouth") // cleaning out someone's mouth is a different act
return
if(target == user && user.a_intent == INTENT_GRAB && ishuman(target))
var/mob/living/carbon/human/muncher = user
if(muncher && isdrask(muncher))
@@ -33,6 +35,7 @@
times_eaten++
playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0)
user.adjust_nutrition(5)
user.reagents.add_reagent("soapreagent", 3)
if(times_eaten < max_bites)
to_chat(user, "<span class='notice'>You take a bite of [src]. Delicious!</span>")
else
@@ -54,7 +57,10 @@
/obj/item/soap/attack(mob/target as mob, mob/user as mob)
if(target && user && ishuman(target) && ishuman(user) && !target.stat && !user.stat && user.zone_selected == "mouth" )
user.visible_message("<span class='warning'>\the [user] washes \the [target]'s mouth out with [name]!</span>")
user.visible_message("<span class='warning'>[user] starts washing [target]'s mouth out with [name]!</span>")
if(do_after(user, cleanspeed, target = target))
user.visible_message("<span class='warning'>[user] washes [target]'s mouth out with [name]!</span>")
target.reagents.add_reagent("soapreagent", 6)
return
..()