From 3472eba242ca72235e076aa332e053e04e7a2af0 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Wed, 8 Aug 2018 13:32:24 +0100 Subject: [PATCH 1/3] prevents 0 value pills being created --- code/modules/reagents/chemistry/machinery/chem_master.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index a4578d9c1e3..97be32c337a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -202,6 +202,8 @@ return name = reject_bad_text(name) while(count--) + if(!LAZYLEN(reagents.reagent_list)) + return var/obj/item/reagent_containers/food/pill/P = new/obj/item/reagent_containers/food/pill(loc) if(!name) name = reagents.get_master_reagent_name() P.name = "[name] pill" From a987dac7956b46b999c7b4b5de106cf5f571864b Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Wed, 8 Aug 2018 14:07:37 +0100 Subject: [PATCH 2/3] changes the check to total_volume --- code/modules/reagents/chemistry/machinery/chem_master.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 97be32c337a..e018a71923a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -202,7 +202,7 @@ return name = reject_bad_text(name) while(count--) - if(!LAZYLEN(reagents.reagent_list)) + if(reagents.total_volume <= 0) return var/obj/item/reagent_containers/food/pill/P = new/obj/item/reagent_containers/food/pill(loc) if(!name) name = reagents.get_master_reagent_name() From d9555921b45498b36153bf42ccccd22164f4a755 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 10 Aug 2018 12:17:15 +0100 Subject: [PATCH 3/3] adds user feedback --- code/modules/reagents/chemistry/machinery/chem_master.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index e018a71923a..90f9ed47eec 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -203,6 +203,7 @@ name = reject_bad_text(name) while(count--) if(reagents.total_volume <= 0) + to_chat(usr, "Not enough reagents to create these pills!") return var/obj/item/reagent_containers/food/pill/P = new/obj/item/reagent_containers/food/pill(loc) if(!name) name = reagents.get_master_reagent_name()