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

Updates the spraycan (#25024)

Browse Source 
* Update crayons.dm

* Update crayons.dm
This commit is contained in:
CRUNCH
2024-04-18 14:01:28 +01:00
committed by GitHub
parent 74d522fe58
commit 35f63afc07
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/crayons.dm
+24 -22
View File
@@ -136,7 +136,6 @@
busy = FALSE
/obj/item/toy/crayon/attack(mob/M, mob/user)
var/huffable = istype(src,/obj/item/toy/crayon/spraycan)
if(M == user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -147,7 +146,7 @@
playsound(loc, 'sound/items/eatfood.ogg', 50, 0)
user.adjust_nutrition(5)
if(times_eaten < max_bites)
to_chat(user, "<span class='notice'>You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!</span>")
to_chat(user, "<span class='notice'>You take a bite of the [name]. Delicious!</span>")
else
to_chat(user, "<span class='warning'>There is no more of [name] left!</span>")
qdel(src)
@@ -302,7 +301,7 @@
/obj/item/toy/crayon/spraycan
name = "\improper Nanotrasen-brand Rapid Paint Applicator"
desc = "A metallic container containing tasty paint."
desc = "A metallic container containing spray paint."
icon_state = "spraycan_cap"
var/capped = TRUE
instant = TRUE
@@ -312,6 +311,9 @@
..()
update_icon()
/obj/item/toy/crayon/spraycan/attack(mob/M, mob/user)
return // To stop you from eating spraycans. It's TOO SILLY!
/obj/item/toy/crayon/spraycan/attack_self(mob/living/user)
var/choice = tgui_input_list(user, "Do you want to...", "Spraycan Options", list("Toggle Cap","Change Drawing", "Change Color"))
switch(choice)
@@ -329,26 +331,26 @@
if(!proximity)
return
if(capped)
to_chat(user, "<span class='warning'>You cannot spray [target] while the cap is still on!</span>")
return
else
if(iscarbon(target))
if(uses - 10 > 0)
uses = uses - 10
var/mob/living/carbon/C = target
user.visible_message("<span class='danger'> [user] sprays [src] into the face of [target]!</span>")
if(C.client)
C.EyeBlurry(6 SECONDS)
C.EyeBlind(2 SECONDS)
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.check_eye_prot() <= 0) // no eye protection? ARGH IT BURNS.
H.Confused(6 SECONDS)
H.KnockDown(6 SECONDS)
H.lip_style = "spray_face"
H.lip_color = colour
H.update_body()
playsound(user, 'sound/effects/spray.ogg', 5, TRUE, 5)
..()
if(iscarbon(target))
if(uses - 10 > 0)
uses = uses - 10
var/mob/living/carbon/C = target
user.visible_message("<span class='danger'> [user] sprays [src] into the face of [target]!</span>")
if(C.client)
C.EyeBlurry(6 SECONDS)
C.EyeBlind(2 SECONDS)
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.check_eye_prot() <= 0) // no eye protection? ARGH IT BURNS.
H.Confused(6 SECONDS)
H.KnockDown(6 SECONDS)
H.lip_style = "spray_face"
H.lip_color = colour
H.update_body()
playsound(user, 'sound/effects/spray.ogg', 5, TRUE, 5)
..()
/obj/item/toy/crayon/spraycan/update_icon_state()
icon_state = "spraycan[capped ? "_cap" : ""]"