diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index e8940afecb..ae9734fa06 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -98,7 +98,6 @@ /obj/item/weapon/paper/alien/AltClick() // No airplanes for me. return -//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm! /obj/item/weapon/paper/New() ..() @@ -212,17 +211,35 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H == user) - user << "You wipe off the lipstick with [src]." - H.lip_style = null - H.update_icons_body() - else - user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \ - "You begin to wipe off [H]'s lipstick.") - if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not. - user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ - "You wipe off [H]'s lipstick.") + if(icon_state == "scrap" && H.check_has_mouth()) //START OF YAWN CHANGES + user << "You begin to stuff \the [src] into your mouth!" + if(do_after(user, 30)) + user << "You stuff \the [src] into your mouth!" + H.ingested.add_reagent("paper", 10) + H.adjustOxyLoss(10) + qdel(src) //End of yawn changes + else + user << "You wipe off the lipstick with [src]." H.lip_style = null H.update_icons_body() + else + if(icon_state == "scrap" && H.check_has_mouth())//start of yawn changes + user.visible_message("[user] begins to stuff \the [src] into [H]'s mouth!", \ + "You begin to stuff \the [src] into [H]'s mouth!",) + if(do_after(user, 30, H)) + user.visible_message("[user] stuffs \the [src] into [H]'s mouth!",\ + "You stuff \the [src] into [H]'s mouth!") + H.ingested.add_reagent("paper", 10) + H.adjustOxyLoss(10) + qdel(src) //end of yawn changed + else + user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \ + "You begin to wipe off [H]'s lipstick.") + if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not. + user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ + "You wipe off [H]'s lipstick.") + H.lip_style = null + H.update_icons_body() /obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0) var/locid = 0 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm index dea0a6a987..cfad178255 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm @@ -537,4 +537,14 @@ description = "A natural slurry that particularily appeals to fish." taste_description = "earthy" reagent_state = LIQUID - color = "#62764E" \ No newline at end of file + 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 \ No newline at end of file