Merge pull request #4317 from Citadel-Station-13/upstream-merge-33309

[MIRROR] Silver slime extract foods now fry correctly
This commit is contained in:
deathride58
2017-12-11 00:03:05 +00:00
committed by GitHub
2 changed files with 9 additions and 5 deletions
@@ -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))
@@ -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."