From 6846e87ae2382aa74b4f1f366d6e82eb3912fc9b Mon Sep 17 00:00:00 2001 From: coiax Date: Sun, 10 Dec 2017 23:41:59 +0000 Subject: [PATCH 1/2] Silver slime extract foods now fry correctly (#33309) * Silver slime extract foods now fry correctly The invocation to create fried food wasn't correct, and was ending up creating fried food that had the default name and description. - Also adds a "syringe/plasma" type, because it's annoying having to spawn in plasma sheets and grind them and then put them into a syringe, if you want to test slime spawning stuff. * Contains --- .../modules/reagents/chemistry/recipes/slime_extracts.dm | 9 ++++----- code/modules/reagents/reagent_containers/syringes.dm | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index f3143e1193..9b04eb1b0a 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -152,11 +152,10 @@ var/chosen = pick(borks) var/obj/B = new chosen(T) if(prob(5))//Fry it! - var/obj/item/reagent_containers/food/snacks/deepfryholder/D = new(T) - var/datum/reagents/reagents = new(25) - reagents.add_reagent("nutriment", 25) - D.fry(B, reagents) - B = D + var/obj/item/reagent_containers/food/snacks/deepfryholder/fried + fried = new(T, B) + fried.fry() // actually set the name and colour it + B = fried if(prob(50)) for(var/j in 1 to rand(1, 3)) step(B, pick(NORTH,SOUTH,EAST,WEST)) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 9695caab02..372cdd2ea6 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -207,6 +207,11 @@ desc = "Contains calomel." list_reagents = list("calomel" = 15) +/obj/item/reagent_containers/syringe/plasma + name = "syringe (plasma)" + desc = "Contains plasma." + list_reagents = list("plasma" = 15) + /obj/item/reagent_containers/syringe/lethal name = "lethal injection syringe" desc = "A syringe used for lethal injections. It can hold up to 50 units."