From 6048378dceef228480b12c6ced9dd1d0783faba1 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 2 Feb 2020 22:13:21 +0100 Subject: [PATCH 1/2] Update hardsuit.dm --- code/modules/clothing/spacesuits/hardsuit.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index c9753b3053..3cd1079f2b 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -190,7 +190,7 @@ item_state = "atmo_helm" item_color = "atmospherics" armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 25, "fire" = 100, "acid" = 75) - heat_protection = HEAD //Uncomment to enable firesuit protection + heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT /obj/item/clothing/suit/space/hardsuit/engine/atmos @@ -199,7 +199,7 @@ icon_state = "hardsuit-atmospherics" item_state = "atmo_hardsuit" armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 25, "fire" = 100, "acid" = 75) - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos From 19b14061985187981b5c3fe6aa2ca0adca656d46 Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 2 Feb 2020 22:15:38 +0100 Subject: [PATCH 2/2] Update plant_genes.dm --- code/modules/hydroponics/plant_genes.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 99fd873995..49f0aa9f53 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -295,9 +295,13 @@ /datum/plant_gene/trait/glow/shadow //makes plant emit slightly purple shadows + //adds -potency*(rate*0.2) light power to products name = "Shadow Emission" rate = 0.04 glow_color = "#AAD84B" + +/datum/plant_gene/trait/glow/shadow/glow_power(obj/item/seeds/S) + return -max(S.potency*(rate*0.2), 0.2) /datum/plant_gene/trait/glow/white name = "White Bioluminescence"