Skip to content

Commit

Permalink
Fixing Kataphract Trader access (Aurorastation#8210)
Browse files Browse the repository at this point in the history
* Fix

* Changelog
  • Loading branch information
Sindorman authored Feb 7, 2020
1 parent a7cb938 commit 0c293f4
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/modules/merchant/merchant_programs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
available_on_ntnet = 0
size = 12
usage_flags = PROGRAM_CONSOLE
required_access_run = access_merchant
required_access_download = access_merchant
requires_access_to_run = PROGRAM_ACCESS_LIST_ONE
required_access_run = list(access_merchant, access_kataphract_trader)
required_access_download = list(access_merchant, access_kataphract_trader)
var/obj/machinery/merchant_pad/pad = null
var/current_merchant = 0
var/show_trades = 0
Expand Down
41 changes: 41 additions & 0 deletions html/changelogs/Sindorman-fix.yml
Original file line number Diff line number Diff line change
@@ -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: PoZe

# 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:
- bugfix: "Merchant trading program now accepts Kataphract Trader acces."

0 comments on commit 0c293f4

Please sign in to comment.