From 5e01ad45a5dc54f2ec42026f46236eb01fb2b62d Mon Sep 17 00:00:00 2001 From: drexample Date: Sat, 11 Jan 2020 06:59:33 +0300 Subject: [PATCH] coding standards are my passion --- code/modules/hydroponics/seed.dm | 4 ++-- code/modules/hydroponics/seed_datums.dm | 1 - code/modules/hydroponics/seed_datums_vr.dm | 3 +++ .../Chemistry-Reagents-Food-Drinks.dm | 7 ------- .../Chemistry-Reagents-Food-Drinks_vr.dm | 10 +++++++++- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 35aae8ebe2..874d3dcb10 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -25,7 +25,7 @@ var/apply_color_to_mob = TRUE // Do we color the mob to match the plant? var/has_item_product // Item products. (Eggy) var/force_layer - var/harvest_sound = null + var/harvest_sound = null //Vorestation edit - sound the plant makes when harvested // Making the assumption anything in HYDRO-ponics is capable of processing water, and nutrients commonly associated with it, leaving us with the below to be tweaked. var/list/beneficial_reagents // Reagents considered uniquely 'beneficial' by a plant. @@ -770,7 +770,7 @@ var/turf/T = get_turf(user) create_spores(T) - if(harvest_sound) + if(harvest_sound)//Vorestation edit var/turf/M = get_turf(user) playsound(M, harvest_sound, 50, 1, -1) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 9331dc60ae..d13a3f7687 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -1503,7 +1503,6 @@ display_name = "gnomes" force_layer = 3 chems = list("magicdust" = list(5,20)) - harvest_sound = 'sound/items/hooh.ogg' /datum/seed/gnomes/New() ..() diff --git a/code/modules/hydroponics/seed_datums_vr.dm b/code/modules/hydroponics/seed_datums_vr.dm index a39c18c44f..5fcf7c4432 100644 --- a/code/modules/hydroponics/seed_datums_vr.dm +++ b/code/modules/hydroponics/seed_datums_vr.dm @@ -39,3 +39,6 @@ set_trait(TRAIT_PRODUCT_ICON,"mushroom6") set_trait(TRAIT_PLANT_ICON,"tree") set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00") + +/datum/seed/gnomes + harvest_sound = 'sound/items/hooh.ogg' \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 22c42dc2cc..9659d84844 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -3536,10 +3536,3 @@ reagent_state = LIQUID nutriment_factor = 40 //very filling color = "#d169b2" - - -/datum/reagent/nutriment/magicdust/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - ..() - playsound(M.loc, 'sound/items/hooh.ogg', 50, 1, -1) - prob(1) - to_chat(M, "You feel like you've been gnomed...") \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm index 0485b231e2..a18207b6e4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm @@ -101,4 +101,12 @@ M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein. if(M.species.gets_food_nutrition) if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein - M.nutrition += (alt_nutriment_factor * removed) \ No newline at end of file + M.nutrition += (alt_nutriment_factor * removed) + + + +/datum/reagent/nutriment/magicdust/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + playsound(M.loc, 'sound/items/hooh.ogg', 50, 1, -1) + if(prob(5)) + to_chat(M, "You feel like you've been gnomed...") \ No newline at end of file