mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
Many botany QoL changes. (#25031)
* Many botany QoL changes. * Give observers a plant analyzer. * Hooks should be executable. * Upgraded Seed Extractor GUI. * Left-align seed extractor, more efficient icon sending. * tgui rebuild * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * 's' properly --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
co-authored by
Burzah
FunnyMan3595
parent
0b838dc3c4
commit
a881e11c86
@@ -61,9 +61,10 @@
|
||||
dispensable_reagents = list(
|
||||
"mutagen",
|
||||
"saltpetre",
|
||||
"eznutriment",
|
||||
"left4zednutriment",
|
||||
"robustharvestnutriment",
|
||||
"eznutrient",
|
||||
"mutrient",
|
||||
"left4zednutrient",
|
||||
"robustharvestnutrient",
|
||||
"water",
|
||||
"atrazine",
|
||||
"pestkiller",
|
||||
@@ -608,9 +609,10 @@
|
||||
dispensable_reagents = list(
|
||||
"mutagen",
|
||||
"saltpetre",
|
||||
"eznutriment",
|
||||
"left4zednutriment",
|
||||
"robustharvestnutriment",
|
||||
"eznutrient",
|
||||
"mutrient",
|
||||
"left4zednutrient",
|
||||
"robustharvestnutrient",
|
||||
"water",
|
||||
"atrazine",
|
||||
"pestkiller",
|
||||
|
||||
@@ -591,40 +591,48 @@
|
||||
|
||||
//////////////////////////////////Hydroponics stuff///////////////////////////////
|
||||
|
||||
/datum/reagent/plantnutriment
|
||||
name = "Generic nutriment"
|
||||
id = "plantnutriment"
|
||||
description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
|
||||
/datum/reagent/plantnutrient
|
||||
name = "Generic nutrient"
|
||||
id = "plantnutrient"
|
||||
description = "Some kind of nutrient. You can't really tell what it is. You should probably report it, along with how you obtained it."
|
||||
color = "#000000" // RBG: 0, 0, 0
|
||||
var/tox_prob = 0
|
||||
taste_description = "puke"
|
||||
|
||||
/datum/reagent/plantnutriment/on_mob_life(mob/living/M)
|
||||
/datum/reagent/plantnutrient/on_mob_life(mob/living/M)
|
||||
var/update_flags = STATUS_UPDATE_NONE
|
||||
if(prob(tox_prob))
|
||||
update_flags |= M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
|
||||
return ..() | update_flags
|
||||
|
||||
/datum/reagent/plantnutriment/eznutriment
|
||||
/datum/reagent/plantnutrient/eznutrient
|
||||
name = "E-Z-Nutrient"
|
||||
id = "eznutriment"
|
||||
description = "Cheap and extremely common type of plant nutriment."
|
||||
color = "#376400" // RBG: 50, 100, 0
|
||||
tox_prob = 10
|
||||
id = "eznutrient"
|
||||
description = "Cheap and boring nutrition for plants."
|
||||
color = "#504700" // RBG: 80, 70, 0
|
||||
tox_prob = 5
|
||||
taste_description = "obscurity and toil"
|
||||
|
||||
/datum/reagent/plantnutriment/left4zednutriment
|
||||
/datum/reagent/plantnutrient/mut
|
||||
name = "Mutrient"
|
||||
id = "mutrient"
|
||||
description = "Plant nutrient designed to trigger mild genetic drift."
|
||||
color = "#376400" // RBG: 50, 100, 0
|
||||
tox_prob = 10
|
||||
taste_description = "change"
|
||||
|
||||
/datum/reagent/plantnutrient/left4zednutrient
|
||||
name = "Left 4 Zed"
|
||||
id = "left4zednutriment"
|
||||
description = "Unstable nutriment that makes plants mutate more often than usual."
|
||||
id = "left4zednutrient"
|
||||
description = "Unstable nutrient that makes plants mutate strongly at the cost of minimal yield."
|
||||
color = "#2A1680" // RBG: 42, 128, 22
|
||||
tox_prob = 25
|
||||
taste_description = "evolution"
|
||||
|
||||
/datum/reagent/plantnutriment/robustharvestnutriment
|
||||
/datum/reagent/plantnutrient/robustharvestnutrient
|
||||
name = "Robust Harvest"
|
||||
id = "robustharvestnutriment"
|
||||
description = "Very potent nutriment that prevents plants from mutating."
|
||||
id = "robustharvestnutrient"
|
||||
description = "Very potent nutrient that increases yield."
|
||||
color = "#9D9D00" // RBG: 157, 157, 0
|
||||
tox_prob = 15
|
||||
taste_description = "bountifulness"
|
||||
|
||||
@@ -1028,7 +1028,7 @@
|
||||
name = "Islay Whiskey"
|
||||
id = "islaywhiskey"
|
||||
result = "islaywhiskey"
|
||||
required_reagents = list("eznutriment" = 1, "whiskey" = 1, "nutriment" = 1)
|
||||
required_reagents = list("eznutrient" = 1, "whiskey" = 1, "nutriment" = 1)
|
||||
result_amount = 3
|
||||
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user