Merge pull request #10268 from GunHog/Ore_ID

Ore Redemption Machine ID improvement
This commit is contained in:
Cheridan
2015-07-04 12:10:56 -05:00
2 changed files with 38 additions and 2 deletions
+2 -2
View File
@@ -191,7 +191,7 @@
inserted_id = I
else usr << "<span class='warning'>No valid ID.</span>"
if(href_list["release"])
if(check_access(inserted_id) || usr.has_unlimited_silicon_privilege)
if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user.
if(!(text2path(href_list["release"]) in stack_list)) return
var/obj/item/stack/sheet/inp = stack_list[text2path(href_list["release"])]
var/obj/item/stack/sheet/out = new inp.type()
@@ -205,7 +205,7 @@
else
usr << "<span class='warning'>Required access not found.</span>"
if(href_list["plasteel"])
if(check_access(inserted_id) || usr.has_unlimited_silicon_privilege)
if(check_access(inserted_id) || allowed(usr))
if(!(/obj/item/stack/sheet/metal in stack_list)) return
if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]