cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

coding standards are my passion

Browse Source
This commit is contained in:
drexample
2020-01-11 06:59:33 +03:00
parent 1be4fe8b3c
commit 5e01ad45a5
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/hydroponics/seed.dm
View File

@@ -25,7 +25,7 @@
var/apply_color_to_mob = TRUE // Do we color the mob to match the plant? var/apply_color_to_mob = TRUE // Do we color the mob to match the plant?
var/has_item_product // Item products. (Eggy) var/has_item_product // Item products. (Eggy)
var/force_layer 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. // 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. var/list/beneficial_reagents // Reagents considered uniquely 'beneficial' by a plant.
@@ -770,7 +770,7 @@
var/turf/T = get_turf(user) var/turf/T = get_turf(user)
create_spores(T) create_spores(T)
if(harvest_sound) if(harvest_sound)//Vorestation edit
var/turf/M = get_turf(user) var/turf/M = get_turf(user)
playsound(M, harvest_sound, 50, 1, -1) playsound(M, harvest_sound, 50, 1, -1)

1
code/modules/hydroponics/seed_datums.dm
View File

@@ -1503,7 +1503,6 @@
display_name = "gnomes" display_name = "gnomes"
force_layer = 3 force_layer = 3
chems = list("magicdust" = list(5,20)) chems = list("magicdust" = list(5,20))
harvest_sound = 'sound/items/hooh.ogg'
/datum/seed/gnomes/New() /datum/seed/gnomes/New()
..() ..()

3
code/modules/hydroponics/seed_datums_vr.dm
View File

@@ -39,3 +39,6 @@
set_trait(TRAIT_PRODUCT_ICON,"mushroom6") set_trait(TRAIT_PRODUCT_ICON,"mushroom6")
set_trait(TRAIT_PLANT_ICON,"tree") set_trait(TRAIT_PLANT_ICON,"tree")
set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00") set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00")
/datum/seed/gnomes
harvest_sound = 'sound/items/hooh.ogg'

7
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -3536,10 +3536,3 @@
reagent_state = LIQUID reagent_state = LIQUID
nutriment_factor = 40 //very filling nutriment_factor = 40 //very filling
color = "#d169b2" 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, "<span class='warning'>You feel like you've been gnomed...")

8
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm
View File

@@ -102,3 +102,11 @@
if(M.species.gets_food_nutrition) if(M.species.gets_food_nutrition)
if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein
M.nutrition += (alt_nutriment_factor * removed) 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, "<span class='warning'>You feel like you've been gnomed...</span>")