cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Circuit Imprinter now checks all stack/material types.

Browse Source 
Instead it only relies on its materials list to see which types are valid. Fixes #12081.
This commit is contained in:
PsiOmegaDelta
2016-01-31 11:01:49 +01:00
parent 7d13e01ff9
commit 56ace3b6ec
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/research/circuitprinter.dm
View File

@@ -118,8 +118,8 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
return 1 return 1
if(O.is_open_container()) if(O.is_open_container())
return 0 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))
user << "<span class='notice'>You cannot insert this item into \the [src].</span>" user << "<span class='notice'>You cannot insert this item into \the [src]!</span>"
return 1 return 1
if(stat) if(stat)
return 1 return 1
@@ -128,8 +128,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid).
user << "<span class='notice'>\The [src]'s material bin is full. Please remove material before adding more.</span>" user << "<span class='notice'>\The [src]'s material bin is full. Please remove material before adding more.</span>"
return 1 return 1
var/obj/item/stack/stack = O var/obj/item/stack/material/stack = O
var/amount = round(input("How many sheets do you want to add?") as num) var/amount = round(input("How many sheets do you want to add?") as num)
if(!O) if(!O)
return return