From 360256e0702c06a038e591417da179a000271e08 Mon Sep 17 00:00:00 2001 From: GunHog Date: Mon, 29 Jun 2015 12:53:45 -0500 Subject: [PATCH] Ore Redemption Machine ID improvement - The Ore Redemption Machine now releases minerals to authorized users without the need for an inserted ID. --- code/modules/mining/equipment_locker.dm | 4 +-- html/changelogs/Gun_Hog_Ore.yml | 36 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Gun_Hog_Ore.yml diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 265238f483c..a6fe0b360b5 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -191,7 +191,7 @@ inserted_id = I else usr << "No valid ID." 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 << "Required access not found." 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] diff --git a/html/changelogs/Gun_Hog_Ore.yml b/html/changelogs/Gun_Hog_Ore.yml new file mode 100644 index 00000000000..0fb8f308d68 --- /dev/null +++ b/html/changelogs/Gun_Hog_Ore.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Gun Hog + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "The Ore Redemption Machine now allows users to release minerals without having to insert an ID first."