From b4102a6dbde824ad70ad22a32765e91d22170b9c Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 6 Nov 2023 09:48:28 -0700 Subject: [PATCH 1/9] Removes mining access requirement from ore redemption consoles (#17714) * Removes mining access requirement from ore redemption consoles The claim points and print yield declarations required mining access to use despite the actual functionality of the console requiring no access. I've removed this access requirement so off-ships with these machines can actually use them. * Update code/modules/mining/machine_processing.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> * Update code/modules/mining/machine_processing.dm Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --------- Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- code/modules/mining/machine_processing.dm | 20 ++++----- .../Nalarac-oreredemptionaccess.yml | 41 +++++++++++++++++++ 2 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 html/changelogs/Nalarac-oreredemptionaccess.yml diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 4506d324152..5145a78e258 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -123,21 +123,15 @@ var/obj/item/card/id/ID = usr.GetIdCard() if(ID) if(params["choice"] == "claim") - if(access_mining_station in ID.access) - if(points >= 0) - ID.mining_points += points - if(points != 0) - ping("\The [src] pings, \"Point transfer complete! Transaction total: [points] points!\"") - points = 0 - else - to_chat(usr, SPAN_WARNING("[station_name()]'s mining division is currently indebted to NanoTrasen. Transaction incomplete until debt is cleared.")) + if(points >= 0) + ID.mining_points += points + if(points != 0) + ping("\The [src] pings, \"Point transfer complete! Transaction total: [points] points!\"") + points = 0 else - to_chat(usr, SPAN_WARNING("Required access not found.")) + ping("\The [src] pings, \"Transaction failed due to a negative point value. No transaction can be done until this value has returned to a positive one.\"") if(params["choice"] == "print_report") - if(access_mining_station in ID.access) - print_report(usr) - else - to_chat(usr, SPAN_WARNING("Required access not found.")) + print_report(usr) return TRUE if(action == "toggle_smelting") diff --git a/html/changelogs/Nalarac-oreredemptionaccess.yml b/html/changelogs/Nalarac-oreredemptionaccess.yml new file mode 100644 index 00000000000..5e93cdd1a34 --- /dev/null +++ b/html/changelogs/Nalarac-oreredemptionaccess.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Nalarac + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Removed mining access requirement to claim points and print yield declarations from ore redemption console." From 433fccac421104bf0d8642fdc0ad86b363a79f71 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Mon, 6 Nov 2023 18:15:16 +0000 Subject: [PATCH 2/9] Automatic Changelog compile [ci skip] --- html/changelog.html | 4 ++ html/changelogs/.all_changelog.yml | 3 ++ .../Nalarac-oreredemptionaccess.yml | 41 ------------------- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/Nalarac-oreredemptionaccess.yml diff --git a/html/changelog.html b/html/changelog.html index a7a13d52441..8e48172e8b9 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -36,6 +36,10 @@

06 November 2023

+

Nalarac updated:

+
    +
  • Removed mining access requirement to claim points and print yield declarations from ore redemption console.
  • +

SleepyGemmy updated: