diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index b5bd3f83f6b..922dd34a166 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -173,7 +173,7 @@ /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_cap name = "mushroom cap" desc = "The cap of a large mushroom." - list_reagents = list("mindbreaker" = 2, "entpoly" = 4, "mushroomhallucinogen" = 2) + list_reagents = list("lsd" = 2, "entpoly" = 4, "psilocybin" = 2) icon_state = "mushroom_cap" /obj/item/weapon/reagent_containers/food/snacks/ash_flora/mushroom_stem diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 23598f55f09..6027a0272d8 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -6,12 +6,8 @@ anchored = 1 invisibility = 101 unacidable = 1 - var/set_light = 8 - var/set_cap = 0 - -/obj/effect/light_emitter/New() - ..() - set_light(set_light, set_cap) + light_range = 8 + light_power = 0 /**********************Miner Lockers**************************/ @@ -95,7 +91,7 @@ var/excavation_amount = 100 /obj/item/weapon/pickaxe/proc/playDigSound() - playsound(src, pick(digsound),20,1) + playsound(src, pick(digsound),20,1) /obj/item/weapon/pickaxe/silver name = "silver-plated pickaxe" diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index fa37e5544e7..e48d9c7eec8 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -831,4 +831,51 @@ /datum/reagent/greenvomit/reaction_turf(turf/T, volume) if(volume >= 5 && !istype(T, /turf/space)) new /obj/effect/decal/cleanable/vomit/green(T) - playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) \ No newline at end of file + playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) + +////Lavaland Flora Reagents//// + +/datum/reagent/consumable/entpoly + name = "Entropic Polypnium" + id = "entpoly" + description = "An ichor, derived from a certain mushroom, makes for a bad time." + color = "#1d043d" + +/datum/reagent/consumable/entpoly/on_mob_life(mob/living/M) + if(current_cycle >= 10) + M.Paralyse(2, 0) + . = 1 + if(prob(20)) + M.LoseBreath(4) + M.adjustBrainLoss(2 * REAGENTS_EFFECT_MULTIPLIER) + M.adjustToxLoss(3 * REAGENTS_EFFECT_MULTIPLIER, 0) + M.adjustStaminaLoss(10 * REAGENTS_EFFECT_MULTIPLIER, 0) + M.EyeBlurry(5) + . = TRUE + ..() + +/datum/reagent/consumable/tinlux + name = "Tinea Luxor" + id = "tinlux" + description = "A stimulating ichor which causes luminescent fungi to grow on the skin. " + color = "#b5a213" + +/datum/reagent/consumable/tinlux/reaction_mob(mob/living/M) + M.set_light(2) + +/datum/reagent/consumable/tinlux/on_mob_delete(mob/living/M) + M.set_light(0) + +/datum/reagent/consumable/vitfro + name = "Vitrium Froth" + id = "vitfro" + description = "A bubbly paste that heals wounds of the skin." + color = "#d3a308" + nutriment_factor = 3 * REAGENTS_METABOLISM + +/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M) + if(prob(80)) + M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, 0) + M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, 0) + . = TRUE + ..() \ No newline at end of file