diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 85f7c838656..c599390bdcd 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -75,7 +75,7 @@ efficiency += S.rating for(var/obj/item/weapon/stock_parts/manipulator/P in component_parts) speed_coeff += P.rating - heal_level = (efficiency * 15) + 10 + heal_level = min((efficiency * 15) + 10, 100) //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 03dd8cfbcf6..ec0b4d250db 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -245,7 +245,7 @@ /obj/machinery/chem_dispenser/attack_ai(mob/user as mob) return src.attack_hand(user) - + /obj/machinery/chem_dispenser/attack_ghost(mob/user as mob) return src.attack_hand(user) @@ -293,7 +293,8 @@ dispensable_reagents = list() var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen", "tungsten", "water"), list("lithium", "sugar", "copper", "mercury", "sodium","iodine","bromine"), - list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron", "silver")) + list("ethanol", "chlorine", "potassium", "aluminum","plasma", "radium", "fluorine", "iron", "silver"), + list("oil", "ash", "acetone", "saltpetre", "ammonia", "diethylamine")) /obj/machinery/chem_dispenser/constructable/New() ..() @@ -306,7 +307,7 @@ component_parts += new /obj/item/weapon/stock_parts/console_screen(null) component_parts += new /obj/item/weapon/stock_parts/cell/super(null) RefreshParts() - + /obj/machinery/chem_dispenser/constructable/upgraded/New() ..() component_parts = list() @@ -640,7 +641,7 @@ /obj/machinery/chem_master/attack_ai(mob/user as mob) return src.attack_hand(user) - + /obj/machinery/chem_master/attack_ghost(mob/user as mob) return src.attack_hand(user)