Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-08e

This commit is contained in:
Waterpig
2024-08-26 11:31:53 +02:00
102 changed files with 3851 additions and 892 deletions
@@ -348,6 +348,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
icon_state = "sheet-hairlesshide"
inhand_icon_state = null
merge_type = /obj/item/stack/sheet/hairlesshide
pickup_sound = 'sound/items/skin_pick_up.ogg'
drop_sound = 'sound/items/skin_drop.ogg'
/obj/item/stack/sheet/hairlesshide/examine(mob/user)
. = ..()
@@ -361,6 +363,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
icon_state = "sheet-wetleather"
inhand_icon_state = null
merge_type = /obj/item/stack/sheet/wethide
pickup_sound = 'sound/items/skin_pick_up.ogg'
drop_sound = 'sound/items/skin_drop.ogg'
/// Reduced when exposed to high temperatures
var/wetness = 30
/// Kelvin to start drying