From 0b3c9238ea7aba2fcf9642e63abd9e330dbf3974 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Wed, 23 Nov 2016 22:31:06 -0600 Subject: [PATCH] Fifty stacks can now be added to the R&D machines. --- code/modules/research/rdmachines.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 2bcf7ef66e..cacdefae23 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -36,19 +36,20 @@ /obj/machinery/r_n_d/proc/getMaterialName(var/type) switch(type) - if(/obj/item/stack/material/steel) + //50-stacks weren't working despite being a subtype of the others, let's just force it in + if(/obj/item/stack/material/steel, /obj/item/stack/material/steel/fifty) return DEFAULT_WALL_MATERIAL - if(/obj/item/stack/material/glass) + if(/obj/item/stack/material/glass, /obj/item/stack/material/glass/fifty) return "glass" - if(/obj/item/stack/material/gold) + if(/obj/item/stack/material/gold, /obj/item/stack/material/gold/fifty) return "gold" - if(/obj/item/stack/material/silver) + if(/obj/item/stack/material/silver, /obj/item/stack/material/silver/fifty) return "silver" - if(/obj/item/stack/material/phoron) + if(/obj/item/stack/material/phoron, /obj/item/stack/material/phoron/fifty) return "phoron" - if(/obj/item/stack/material/uranium) + if(/obj/item/stack/material/uranium, /obj/item/stack/material/uranium/fifty) return "uranium" - if(/obj/item/stack/material/diamond) + if(/obj/item/stack/material/diamond, /obj/item/stack/material/diamond/fifty) return "diamond" /obj/machinery/r_n_d/proc/eject(var/material, var/amount)