From 3a97af10cf4f81f634a43792ecce967e228a7f72 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 24 May 2017 00:18:51 -0500 Subject: [PATCH] Water wets hide, you can microwave wet leather --- code/game/objects/items/stacks/sheets/leather.dm | 13 ++++++------- .../reagents/chemistry/reagents/other_reagents.dm | 8 +++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 14e4f5a01c..9c14a4376a 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -196,13 +196,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") if(do_after(user,50, target = src)) to_chat(user, "You cut the hair from this [src.singular_name].") - //Try locating an exisitng stack on the tile and add to there if possible - for(var/obj/item/stack/sheet/hairlesshide/HS in user.loc) - if(HS.amount < 50) - HS.amount++ - use(1) - break - //If it gets to here it means it did not find a suitable stack on the tile. var/obj/item/stack/sheet/hairlesshide/HS = new(user.loc) HS.amount = 1 use(1) @@ -230,3 +223,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \ HS.amount = 1 wetness = initial(wetness) src.use(1) + +/obj/item/stack/sheet/wetleather/microwave_act(obj/machinery/microwave/MW) + ..() + var/obj/item/stack/sheet/leather/L = new(loc) + L.amount = amount + qdel(src) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index b30207eaf3..59d01e872a 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -160,6 +160,12 @@ var/obj/item/toy/carpplushie/dehy_carp/dehy = O dehy.Swell() // Makes a carp + else if(istype(O, /obj/item/stack/sheet/hairlesshide)) + var/obj/item/stack/sheet/hairlesshide/HH = O + var/obj/item/stack/sheet/wetleather/WL = new(get_turf(HH)) + WL.amount = HH.amount + qdel(HH) + /* * Water reaction to a mob */ @@ -1126,7 +1132,7 @@ /datum/reagent/nitrous_oxide/reaction_mob(mob/M, method=TOUCH, reac_volume) if(method == VAPOR) M.drowsyness += max(round(reac_volume, 1), 2) - + /datum/reagent/nitrous_oxide/on_mob_life(mob/living/M) M.drowsyness += 2 if(ishuman(M))