From 14e41e8d68af6f93fe8c8bf3a2c63bb5305167c3 Mon Sep 17 00:00:00 2001 From: CameronWoof Date: Sun, 16 Feb 2020 03:52:07 -0800 Subject: [PATCH 1/8] adds diethylamine and saltpetre to the biogenerator --- code/modules/hydroponics/hydroponics.dm | 2 +- .../reagents/reagent_containers/bottle.dm | 5 +++++ .../research/designs/biogenerator_designs.dm | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 1cd63db6da..d37c5af6c2 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -664,7 +664,7 @@ adjustHealth(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 1)) adjustNutri(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 2)) if(myseed) - myseed.adjust_yield(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 0.02)) + myseed.adjust_yield(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 0.034)) adjustPests(-rand(1,2)) // Nutriment Compost, effectively diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index c05f4f3e78..e27ff37c5b 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -112,6 +112,11 @@ desc = "A small bottle of diethylamine." list_reagents = list(/datum/reagent/diethylamine = 30) +/obj/item/reagent_containers/glass/bottle/saltpetre + name = "saltpetre bottle" + desc = "A small bottle of saltpetre." + list_reagents = list(/datum/reagent/saltpetre = 30) + /obj/item/reagent_containers/glass/bottle/facid name = "Fluorosulfuric Acid Bottle" desc = "A small bottle. Contains a small amount of fluorosulfuric acid." diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index dd55697bee..5fff7dc3c4 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -107,6 +107,22 @@ build_path = /obj/item/reagent_containers/glass/bottle/nutrient/rh category = list("initial","Botany Chemicals") +/datum/design/diethylamine + name = "Diethylamine" + id = "diethylamine_biogen" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 75) + build_path = /obj/item/reagent_containers/glass/bottle/diethylamine + category = list("initial","Botany Chemicals") + +/datum/design/saltpetre + name = "Saltpetre" + id = "saltpetre_biogen" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 125) + build_path = /obj/item/reagent_containers/glass/bottle/saltpetre + category = list("initial","Botany Chemicals") + /datum/design/weed_killer name = "Weed Killer" id = "weed_killer" From 206e546254ed4705d768c82049f7b0812c9bf5b4 Mon Sep 17 00:00:00 2001 From: CameronWoof Date: Sun, 16 Feb 2020 04:15:50 -0800 Subject: [PATCH 2/8] reordering these designs --- .../research/designs/biogenerator_designs.dm | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index 5fff7dc3c4..7f0203ecdd 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -107,22 +107,6 @@ build_path = /obj/item/reagent_containers/glass/bottle/nutrient/rh category = list("initial","Botany Chemicals") -/datum/design/diethylamine - name = "Diethylamine" - id = "diethylamine_biogen" - build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 75) - build_path = /obj/item/reagent_containers/glass/bottle/diethylamine - category = list("initial","Botany Chemicals") - -/datum/design/saltpetre - name = "Saltpetre" - id = "saltpetre_biogen" - build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 125) - build_path = /obj/item/reagent_containers/glass/bottle/saltpetre - category = list("initial","Botany Chemicals") - /datum/design/weed_killer name = "Weed Killer" id = "weed_killer" @@ -139,6 +123,22 @@ build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller category = list("initial","Botany Chemicals") +/datum/design/diethylamine + name = "Diethylamine" + id = "diethylamine_biogen" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 75) + build_path = /obj/item/reagent_containers/glass/bottle/diethylamine + category = list("initial","Botany Chemicals") + +/datum/design/saltpetre + name = "Saltpetre" + id = "saltpetre_biogen" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 125) + build_path = /obj/item/reagent_containers/glass/bottle/saltpetre + category = list("initial","Botany Chemicals") + /datum/design/botany_bottle name = "Empty Bottle" id = "botany_bottle" From 3ecd1b75d444b6898c64a30d8828628eecf7101f Mon Sep 17 00:00:00 2001 From: Cameron! Date: Sun, 16 Feb 2020 15:32:05 -0800 Subject: [PATCH 3/8] ghommald's changes --- code/modules/research/designs/biogenerator_designs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index 7f0203ecdd..c2f505a93a 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -127,7 +127,7 @@ name = "Diethylamine" id = "diethylamine_biogen" build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 75) + materials = list(MAT_BIOMASS = 150) build_path = /obj/item/reagent_containers/glass/bottle/diethylamine category = list("initial","Botany Chemicals") @@ -135,7 +135,7 @@ name = "Saltpetre" id = "saltpetre_biogen" build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 125) + materials = list(MAT_BIOMASS = 225) build_path = /obj/item/reagent_containers/glass/bottle/saltpetre category = list("initial","Botany Chemicals") From a4a5efbc11ff2bd1b548cf3bb7bc363024414d87 Mon Sep 17 00:00:00 2001 From: Cameron! Date: Sun, 16 Feb 2020 15:48:22 -0800 Subject: [PATCH 4/8] ghommble's other changes --- .../research/designs/biogenerator_designs.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index c2f505a93a..43562a7e12 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -3,7 +3,7 @@ /////////////////////////////////// /datum/design/milk - name = "10 Milk" + name = "10u Milk" id = "milk" build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 20) @@ -11,7 +11,7 @@ category = list("initial","Food") /datum/design/cream - name = "10 Cream" + name = "10u Cream" id = "cream" build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 30) @@ -124,19 +124,19 @@ category = list("initial","Botany Chemicals") /datum/design/diethylamine - name = "Diethylamine" + name = "10u Diethylamine" id = "diethylamine_biogen" build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 150) - build_path = /obj/item/reagent_containers/glass/bottle/diethylamine + materials = list(MAT_BIOMASS = 50) + make_reagents = list(/datum/reagent/diethylamine = 10) category = list("initial","Botany Chemicals") /datum/design/saltpetre - name = "Saltpetre" + name = "10u Saltpetre" id = "saltpetre_biogen" build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 225) - build_path = /obj/item/reagent_containers/glass/bottle/saltpetre + materials = list(MAT_BIOMASS = 75) + make_reagents = list(/datum/reagent/saltpetre = 10) category = list("initial","Botany Chemicals") /datum/design/botany_bottle From 78fad64d5661ee591190fd1875aeaeb777734eed Mon Sep 17 00:00:00 2001 From: Cameron! Date: Sun, 16 Feb 2020 15:54:41 -0800 Subject: [PATCH 5/8] this is no longer necessary --- code/modules/hydroponics/hydroponics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index d37c5af6c2..1cd63db6da 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -664,7 +664,7 @@ adjustHealth(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 1)) adjustNutri(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 2)) if(myseed) - myseed.adjust_yield(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 0.034)) + myseed.adjust_yield(round(S.get_reagent_amount(/datum/reagent/diethylamine) * 0.02)) adjustPests(-rand(1,2)) // Nutriment Compost, effectively From 28a589d2d1b57d23fe993f6a12625881fed4c43d Mon Sep 17 00:00:00 2001 From: Cameron! Date: Mon, 17 Feb 2020 04:32:39 -0800 Subject: [PATCH 6/8] diethylamine > ammonia --- code/modules/research/designs/biogenerator_designs.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index 43562a7e12..ab0460974c 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -123,12 +123,12 @@ build_path = /obj/item/reagent_containers/glass/bottle/killer/pestkiller category = list("initial","Botany Chemicals") -/datum/design/diethylamine - name = "10u Diethylamine" - id = "diethylamine_biogen" +/datum/design/ammonia + name = "10u Ammonia" + id = "ammonia_biogen" build_type = BIOGENERATOR - materials = list(MAT_BIOMASS = 50) - make_reagents = list(/datum/reagent/diethylamine = 10) + materials = list(MAT_BIOMASS = 25) + make_reagents = list(/datum/reagent/ammonia = 10) category = list("initial","Botany Chemicals") /datum/design/saltpetre From a9f103fb34e4bde51b51b18e3ecf164b45ad2867 Mon Sep 17 00:00:00 2001 From: Cameron! Date: Mon, 17 Feb 2020 15:28:10 -0800 Subject: [PATCH 7/8] removes unused bottle, kicks travis? --- code/modules/reagents/reagent_containers/bottle.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index e27ff37c5b..e4741bb858 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -112,11 +112,6 @@ desc = "A small bottle of diethylamine." list_reagents = list(/datum/reagent/diethylamine = 30) -/obj/item/reagent_containers/glass/bottle/saltpetre - name = "saltpetre bottle" - desc = "A small bottle of saltpetre." - list_reagents = list(/datum/reagent/saltpetre = 30) - /obj/item/reagent_containers/glass/bottle/facid name = "Fluorosulfuric Acid Bottle" desc = "A small bottle. Contains a small amount of fluorosulfuric acid." @@ -436,4 +431,4 @@ /obj/item/reagent_containers/glass/bottle/hexacamphor name = "Hexacamphor bottle" desc = "A bottle of strong anaphrodisiac. Reduces libido." - list_reagents = list(/datum/reagent/drug/anaphrodisiacplus = 30) \ No newline at end of file + list_reagents = list(/datum/reagent/drug/anaphrodisiacplus = 30)