diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 3adce092927..ad7f8d1b1d1 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -799,7 +799,7 @@ duration = 30 SECONDS /datum/status_effect/lavaland_eternal_bleeding_fix/tick(seconds_between_ticks) - if(ishuman(user)) + if(ishuman(owner)) var/mob/living/carbon/human/hum = owner for(var/obj/item/organ/external/bodypart as anything in hum.bodyparts) if(bodypart.has_internal_bleeding() && prob(7)) @@ -825,7 +825,7 @@ human.set_vision_override(null) /datum/status_effect/lavaland_blood_regen - name = "Lavaland Blood Regeneration" + id = "Lavaland Blood Regeneration" status_type = STATUS_EFFECT_REFRESH duration = 5 MINUTES diff --git a/code/modules/food_and_drinks/food/foods/lavaland_food.dm b/code/modules/food_and_drinks/food/foods/lavaland_food.dm index 93ad98757af..98bd7c78982 100644 --- a/code/modules/food_and_drinks/food/foods/lavaland_food.dm +++ b/code/modules/food_and_drinks/food/foods/lavaland_food.dm @@ -1,5 +1,7 @@ /obj/item/reagent_containers/food/snacks/lavaland icon = 'icons/obj/lavaland/lava_fishing.dmi' + var/overlay_sprite + list_reagents = list("nutriment" = 2, "vitamin" = 4, "protein" = 2) /obj/item/reagent_containers/food/snacks/lavaland/soft_meat name = "soft meat cut" @@ -61,6 +63,54 @@ tastes = list("meat" = 1) foodtype = MEAT +/obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_bacon + name = "thali lazis bacon part" + desc = "Небольшая порция бекона, взятая из тарелки Тали Лазис." + icon = 'icons/obj/lavaland/ashie_food.dmi' + icon_state = "thali_lazis_bacon" + overlay_sprite = "thali_lazis_bacon_overlay" + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_cacti + name = "thali lazis cacti part" + desc = "Небольшой кактус, взятый из тарелки Тали Лазис." + icon = 'icons/obj/lavaland/ashie_food.dmi' + icon_state = "thali_lazis_cacti" + overlay_sprite = "thali_lazis_cacti_overlay" + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_wing + name = "thali lazis wing part" + desc = "Небольшое крыло, взятое из тарелки Тали Лазис." + icon = 'icons/obj/lavaland/ashie_food.dmi' + icon_state = "thali_lazis_wing" + overlay_sprite = "thali_lazis_wing_overlay" + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_fish + name = "thali lazis fish part" + desc = "Небольшая порция рыбы, взятая из тарелки Тали Лазис." + icon = 'icons/obj/lavaland/ashie_food.dmi' + icon_state = "thali_lazis_fish" + overlay_sprite = "thali_lazis_fish_overlay" + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_crunchie + name = "thali lazis crunchie part" + desc = "Небольшая хрустящая порция, взятая из тарелки Тали Лазис." + icon = 'icons/obj/lavaland/ashie_food.dmi' + icon_state = "thali_lazis_crunchie" + overlay_sprite = "thali_lazis_crunchie_overlay" + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_bungus + name = "thali lazis bungus part" + desc = "Небольшая порция грибов, взятая из тарелки Тали Лазис." + icon = 'icons/obj/lavaland/ashie_food.dmi' + icon_state = "thali_lazis_bungus" + overlay_sprite = "thali_lazis_bungus_overlay" + foodtype = VEGETABLES + /obj/item/reagent_containers/food/snacks/lavaland_food name = "generic lavaland food" desc = "самое обычное блюдо. Если вы это видите, то зюзя напортачил" @@ -210,7 +260,7 @@ /obj/item/reagent_containers/food/snacks/lavaland_food/goli_kernels/triple/Initialize(mapload) . = ..() for(var/i in 1 to 3) - var/obj/item/reagent_containers/food/snacks/lavaland_food/goli_kernels/food = new(loc) + new obj/item/reagent_containers/food/snacks/lavaland_food/goli_kernels/food(src.loc) return INITIALIZE_HINT_QDEL /obj/item/reagent_containers/food/snacks/lavaland_food/goli_kernels/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) @@ -296,4 +346,37 @@ var/mob/living/living_user = user living_user.apply_status_effect(STATUS_EFFECT_LAVALAND_BLOOD_REGEN) -/obj/item/reagent_containers/food/snacks/lavaland_food/twelve +/obj/item/storage/bag/tray/lava_tray + name = "thali lazis plate" + desc = "Большой поднос, сделанный из дерева. Предназначен для хранения огромного количества съестного." + icon = 'icons/obj/lavaland/ashie_food.dmi' + icon_state = "thali_lazis_plate" + flags = NONE + materials = null + can_hold = list( + /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_bacon, + /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_cacti, + /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_wing, + /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_fish, + /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_crunchie, + /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_bungus, + ) + display_contents_with_number = TRUE + storage_slots = 12 + max_combined_w_class = 30 + slot_flags = NONE + +/obj/item/storage/bag/tray/lava_tray/update_overlays() + . = ..() + for(var/obj/item/reagent_containers/food/snacks/lavaland/snack in contents) + . += image(icon = snack.icon, icon_state = snack.overlay_sprite) + +/obj/item/storage/bag/tray/lava_tray/full/populate_contents() + for(var/i in 1 to 2) + new /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_bacon(src) + new /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_cacti(src) + new /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_wing(src) + new /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_fish(src) + new /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_crunchie(src) + new /obj/item/reagent_containers/food/snacks/lavaland/thali_lazis_bungus(src) + update_overlays() diff --git a/code/modules/food_and_drinks/recipes/recipes_tribal.dm b/code/modules/food_and_drinks/recipes/recipes_tribal.dm index 50cba1b7b8d..14eca0fc4b5 100644 --- a/code/modules/food_and_drinks/recipes/recipes_tribal.dm +++ b/code/modules/food_and_drinks/recipes/recipes_tribal.dm @@ -202,6 +202,29 @@ ) result = /obj/item/reagent_containers/food/snacks/lavaland_food/predatory_chowder -/datum/recipe/tribal_oven/eleven +/datum/recipe/tribal_oven/abu_ghosh + reagents = list( + "bugmilk" = 30 + ) + items = list( + /obj/item/reagent_containers/food/snacks/grown/ash_flora/fireblossom, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/grown/wheat + ) + result = /obj/item/reagent_containers/food/snacks/lavaland_food/abu_ghosh -/datum/recipe/tribal_oven/twelve +/datum/recipe/tribal_oven/thali_lazis + reagents = list() + items = list( + /obj/item/reagent_containers/food/snacks/grown/mushroom/reishi, + /obj/item/crusher_trophy/watcher_wing, + /obj/item/reagent_containers/food/snacks/grown/wheat, + /obj/item/reagent_containers/food/snacks/lavaland/soft_meat, + /obj/item/reagent_containers/food/snacks/grown/ash_flora/fireblossom, + /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf, + /obj/item/reagent_containers/food/snacks/monstermeat/spiderleg, + /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit, + /obj/item/reagent_containers/food/snacks/raw_bacon, + /obj/item/reagent_containers/food/snacks/rawcutlet + ) + result = /obj/item/storage/bag/tray/lava_tray/full diff --git a/code/modules/mining/ash_walkers/misc.dm b/code/modules/mining/ash_walkers/misc.dm index 2f50fa7d436..e221871c5ce 100644 --- a/code/modules/mining/ash_walkers/misc.dm +++ b/code/modules/mining/ash_walkers/misc.dm @@ -60,8 +60,7 @@ user.put_in_hands(food) if(meat_parts == 0) visible_message(span_warning("от постамента остается лишь одно копье!")) - var/obj/item/twohanded/spear/bonespear/spear - spear = new(loc) + new /obj/item/twohanded/spear/bonespear/spear(src.loc) qdel(src) return ATTACK_CHAIN_PROCEED return ATTACK_CHAIN_SUCCESS diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 5c99a6b3322..80ab54d6c5e 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -1630,7 +1630,6 @@ can_synth = FALSE /datum/reagent/medicine/ashiezine/on_mob_life(mob/living/M) - var/update_flags = STATUS_UPDATE_NONE if(isashwalker(M)) M.reagents.add_reagent("epinephrine", 0.2) M.reagents.add_reagent("heparin", 0,4) diff --git a/icons/obj/lavaland/Ashie_Food.dmi b/icons/obj/lavaland/Ashie_Food.dmi index 4a964ac2748..0584e44848b 100644 Binary files a/icons/obj/lavaland/Ashie_Food.dmi and b/icons/obj/lavaland/Ashie_Food.dmi differ