From eee8b7671f1b5b23161bbe56f517732f9ed34b0e Mon Sep 17 00:00:00 2001 From: theo-3 <85434590+theo-3@users.noreply.github.com> Date: Fri, 16 Jul 2021 21:17:21 +0300 Subject: [PATCH] Add variants to seed extractor UI --- code/modules/hydroponics/seed_extractor.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm index 34ec63ebcb7..f35d7751c7a 100644 --- a/code/modules/hydroponics/seed_extractor.dm +++ b/code/modules/hydroponics/seed_extractor.dm @@ -109,6 +109,7 @@ /datum/seed_pile var/name = "" + var/variant = "" var/lifespan = 0 //Saved stats var/endurance = 0 var/maturation = 0 @@ -117,8 +118,9 @@ var/potency = 0 var/amount = 0 -/datum/seed_pile/New(name, life, endur, matur, prod, yie, poten, am = 1) +/datum/seed_pile/New(name, variant, life, endur, matur, prod, yie, poten, am = 1) src.name = name + src.variant = variant src.lifespan = life src.endurance = endur src.maturation = matur @@ -145,9 +147,9 @@ if (contents.len == 0) dat += "No seeds" else - dat += "" + dat += "
NameLifespanEnduranceMaturationProductionYieldPotencyStock
" for (var/datum/seed_pile/O in piles) - dat += "" + dat += "" dat += "" dat += "
NameVariantLifespanEnduranceMaturationProductionYieldPotencyStock
[O.name][O.lifespan][O.endurance][O.maturation]
[O.name][O.variant][O.lifespan][O.endurance][O.maturation][O.production][O.yield][O.potency]" dat += "Vend ([O.amount] left)
" @@ -203,9 +205,9 @@ O.forceMove(src) . = 1 for (var/datum/seed_pile/N in piles) - if (O.plantname == N.name && O.lifespan == N.lifespan && O.endurance == N.endurance && O.maturation == N.maturation && O.production == N.production && O.yield == N.yield && O.potency == N.potency) + if (O.plantname == N.name && O.variant == N.variant && O.lifespan == N.lifespan && O.endurance == N.endurance && O.maturation == N.maturation && O.production == N.production && O.yield == N.yield && O.potency == N.potency) ++N.amount return - piles += new /datum/seed_pile(O.plantname, O.lifespan, O.endurance, O.maturation, O.production, O.yield, O.potency) + piles += new /datum/seed_pile(O.plantname, O.variant, O.lifespan, O.endurance, O.maturation, O.production, O.yield, O.potency) return