Merge pull request #1147 from Citadel-Station-13/upstream-merge-27546
[MIRROR] Water wets hide, you can microwave wet leather
This commit is contained in:
@@ -196,13 +196,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
|
|||||||
user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
|
user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
|
||||||
if(do_after(user,50, target = src))
|
if(do_after(user,50, target = src))
|
||||||
to_chat(user, "<span class='notice'>You cut the hair from this [src.singular_name].</span>")
|
to_chat(user, "<span class='notice'>You cut the hair from this [src.singular_name].</span>")
|
||||||
//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)
|
var/obj/item/stack/sheet/hairlesshide/HS = new(user.loc)
|
||||||
HS.amount = 1
|
HS.amount = 1
|
||||||
use(1)
|
use(1)
|
||||||
@@ -230,3 +223,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
|
|||||||
HS.amount = 1
|
HS.amount = 1
|
||||||
wetness = initial(wetness)
|
wetness = initial(wetness)
|
||||||
src.use(1)
|
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)
|
||||||
|
|||||||
@@ -160,6 +160,12 @@
|
|||||||
var/obj/item/toy/carpplushie/dehy_carp/dehy = O
|
var/obj/item/toy/carpplushie/dehy_carp/dehy = O
|
||||||
dehy.Swell() // Makes a carp
|
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
|
* Water reaction to a mob
|
||||||
*/
|
*/
|
||||||
@@ -1130,7 +1136,7 @@
|
|||||||
/datum/reagent/nitrous_oxide/reaction_mob(mob/M, method=TOUCH, reac_volume)
|
/datum/reagent/nitrous_oxide/reaction_mob(mob/M, method=TOUCH, reac_volume)
|
||||||
if(method == VAPOR)
|
if(method == VAPOR)
|
||||||
M.drowsyness += max(round(reac_volume, 1), 2)
|
M.drowsyness += max(round(reac_volume, 1), 2)
|
||||||
|
|
||||||
/datum/reagent/nitrous_oxide/on_mob_life(mob/living/M)
|
/datum/reagent/nitrous_oxide/on_mob_life(mob/living/M)
|
||||||
M.drowsyness += 2
|
M.drowsyness += 2
|
||||||
if(ishuman(M))
|
if(ishuman(M))
|
||||||
|
|||||||
Reference in New Issue
Block a user