cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

adds papereating

Browse Source
This commit is contained in:
Cebutris
2019-10-01 17:03:30 -04:00
parent 40913f633b
commit b9c1c1995b
2 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
code/modules/paperwork/paper.dm
View File

@@ -98,7 +98,6 @@
/obj/item/weapon/paper/alien/AltClick() // No airplanes for me. /obj/item/weapon/paper/alien/AltClick() // No airplanes for me.
return return
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
/obj/item/weapon/paper/New() /obj/item/weapon/paper/New()
..() ..()
@@ -212,17 +211,35 @@
if(ishuman(M)) if(ishuman(M))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H == user) if(H == user)
user << "<span class='notice'>You wipe off the lipstick with [src].</span>" if(icon_state == "scrap" && H.check_has_mouth()) //START OF YAWN CHANGES
H.lip_style = null user << "<span class='warning'>You begin to stuff \the [src] into your mouth!</span>"
H.update_icons_body() if(do_after(user, 30))
else user << "<span class='warning'>You stuff \the [src] into your mouth!</span>"
user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \ H.ingested.add_reagent("paper", 10)
"<span class='notice'>You begin to wipe off [H]'s lipstick.</span>") H.adjustOxyLoss(10)
if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not. qdel(src) //End of yawn changes
user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \ else
"<span class='notice'>You wipe off [H]'s lipstick.</span>") user << "<span class='notice'>You wipe off the lipstick with [src].</span>"
H.lip_style = null H.lip_style = null
H.update_icons_body() H.update_icons_body()
else
if(icon_state == "scrap" && H.check_has_mouth())//start of yawn changes
user.visible_message("<span class='warning'>[user] begins to stuff \the [src] into [H]'s mouth!</span>", \
"<span class='warning'>You begin to stuff \the [src] into [H]'s mouth!</span>",)
if(do_after(user, 30, H))
user.visible_message("<span class='warning'>[user] stuffs \the [src] into [H]'s mouth!</span>",\
"<span class='warning'>You stuff \the [src] into [H]'s mouth!</span>")
H.ingested.add_reagent("paper", 10)
H.adjustOxyLoss(10)
qdel(src) //end of yawn changed
else
user.visible_message("<span class='warning'>[user] begins to wipe [H]'s lipstick off with \the [src].</span>", \
"<span class='notice'>You begin to wipe off [H]'s lipstick.</span>")
if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not.
user.visible_message("<span class='notice'>[user] wipes [H]'s lipstick off with \the [src].</span>", \
"<span class='notice'>You wipe off [H]'s lipstick.</span>")
H.lip_style = null
H.update_icons_body()
/obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0) /obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0)
var/locid = 0 var/locid = 0

12
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
View File

@@ -537,4 +537,14 @@
description = "A natural slurry that particularily appeals to fish." description = "A natural slurry that particularily appeals to fish."
taste_description = "earthy" taste_description = "earthy"
reagent_state = LIQUID reagent_state = LIQUID
color = "#62764E" color = "#62764E"
//YAWN ADDITION. Paper!
/datum/reagent/nutriment/paper //Paper is made from cellulose. You can eat it. It doesn't fill you up very much at all.
name = "Paper"
id = "paper"
description = "Soggy, ground up paper"
taste_description = "paper"
reagent_state = SOLID
color = "e6e6e6" //not quite white
nutriment_factor = 2 // 5 times worse than nutriment