From 2145b0371c97c1e19e1a481e87cd1445271dd18c Mon Sep 17 00:00:00 2001 From: Mechoid Date: Mon, 8 Jan 2018 21:25:52 -0800 Subject: [PATCH] Allows circuit printers, protolathes, mech fabricators, and prosthetic fabricators to store and use plastic and osmium sheets. No blueprints currently use either, however. --- code/game/mecha/mech_fabricator.dm | 2 +- code/game/mecha/mech_prosthetics.dm | 2 +- code/modules/research/circuitprinter.dm | 4 ++-- code/modules/research/protolathe.dm | 6 +++++- code/modules/research/rdmachines.dm | 8 ++++++++ icons/obj/robotics.dmi | Bin 12530 -> 12528 bytes 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index fa511bf412..8914631ad0 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -13,7 +13,7 @@ var/speed = 1 var/mat_efficiency = 1 - var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0) + var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0) var/res_max_amount = 200000 var/datum/research/files diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index 5a665dfd43..a151d0638f 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -13,7 +13,7 @@ var/speed = 1 var/mat_efficiency = 1 - var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0, "plasteel" = 0) + var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "diamond" = 0, "phoron" = 0, "uranium" = 0, "plasteel" = 0) var/res_max_amount = 200000 var/datum/research/files diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 97942f0d02..936330d00a 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -16,7 +16,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). var/mat_efficiency = 1 var/speed = 1 - materials = list("metal" = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) + materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) use_power = 1 idle_power_usage = 30 @@ -120,7 +120,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). return 1 if(O.is_open_container()) return 0 - if(!istype(O, /obj/item/stack/material/glass) && !istype(O, /obj/item/stack/material/gold) && !istype(O, /obj/item/stack/material/diamond) && !istype(O, /obj/item/stack/material/uranium)) + if(!istype(O, /obj/item/stack/material)) //Previously checked for specific material sheets, for some reason? Made the check on 133 redundant. user << "You cannot insert this item into \the [src]." return 1 if(stat) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 2333482761..b90937343c 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -15,7 +15,7 @@ var/mat_efficiency = 1 var/speed = 1 - materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) + materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "plastic" = 0, "gold" = 0, "silver" = 0, "osmium" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) /obj/machinery/r_n_d/protolathe/New() ..() @@ -213,10 +213,14 @@ mattype = /obj/item/stack/material/steel if("glass") mattype = /obj/item/stack/material/glass + if("plastic") + mattype = /obj/item/stack/material/plastic if("gold") mattype = /obj/item/stack/material/gold if("silver") mattype = /obj/item/stack/material/silver + if("osmium") + mattype = /obj/item/stack/material/osmium if("diamond") mattype = /obj/item/stack/material/diamond if("phoron") diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 2bcf7ef66e..208ac79d5a 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -22,10 +22,14 @@ return /obj/item/stack/material/steel if("glass") return /obj/item/stack/material/glass + if("plastic") + return /obj/item/stack/material/plastic if("gold") return /obj/item/stack/material/gold if("silver") return /obj/item/stack/material/silver + if("osmium") + return /obj/item/stack/material/osmium if("phoron") return /obj/item/stack/material/phoron if("uranium") @@ -40,10 +44,14 @@ return DEFAULT_WALL_MATERIAL if(/obj/item/stack/material/glass) return "glass" + if(/obj/item/stack/material/plastic) + return "plastic" if(/obj/item/stack/material/gold) return "gold" if(/obj/item/stack/material/silver) return "silver" + if(/obj/item/stack/material/osmium) + return "osmium" if(/obj/item/stack/material/phoron) return "phoron" if(/obj/item/stack/material/uranium) diff --git a/icons/obj/robotics.dmi b/icons/obj/robotics.dmi index e45848975bee2d38ad6c2ee61352ecf7be60aef2..1a7e1caf676bbc769cb14e451a67d6f6195971d2 100644 GIT binary patch delta 357 zcmV-r0h<2uVeny)B!5nNR9JLGWpiV4X>fFDZ*Bkpc$}q_!H$C<5Qfk46qEL<8@27; zxNK}T9@=-97FtO_3|O0e`#tP#bX%n&;Xp`cKK?L2{~A8_pXCvXLrFSrtk5-3*uJGC zx(n7;Kw*=UsN&*UwLb^jV#|TT>Vl^P&#mbAibPBp3luUEU4INJZh^vEbZSyfUaOB8QWj+gJA-%pa!|$SIBcL$X_lU)|A0QU` zUh#9~&V#(~&sowm&YpW;Kl@*$>*Y5Cq1i6ZM%U(d-#(m2*Yo|a2KGLX(BC=1aZJsR zGdVghj4QajK+gE`BDq4$3*?S6FO)0Lyg<%an;@-We=MLll;j)6sxyWBB6BpeeF1eZ DIG?T! delta 359 zcmV-t0hs>qVe(;+B!5tPR9JLGWpiV4X>fFDZ*Bkpc$}q_!H&Wp5Qfk26cfGHjkLPA zUN)MI2YrW8(2_uD05$ved)VFR)|QqM4uoXp;}7%m&*5YHxjVpSzoR!{oisI+uzFik za+lm!P(qPYQVDsf{LjI8^a4tlo$LzRw;%c#$SDnOY z6grJbh$GhNI*_Br+NWZ;L~ZIxlWDARuQK%V#gkCB&RFLve)m=D+__%w9~#*ElZ3~eJ)FSQ z;yAsdi^7D$D+&~huqaX}$f7{uIEz9Jg<2FW7;QbIIcyIb*z9-o8}_$0lg)*TqO*Ge FbuYOFyLbQq