Golden Deep Fixes & Merchant Program Refactor

code/modules/merchant/merchant_programs.dm

@@ -9,8 +9,9 @@
 	size = 12
 	usage_flags = PROGRAM_CONSOLE
 	requires_access_to_run = PROGRAM_ACCESS_LIST_ONE
-	required_access_run = list(ACCESS_MERCHANT)
-	required_access_download = list(ACCESS_MERCHANT)
+	requires_access_to_download = PROGRAM_ACCESS_LIST_ONE
+	required_access_run = list(ACCESS_MERCHANT, ACCESS_GOLDEN_DEEP, ACCESS_GOLDEN_DEEP_OWNED, ACCESS_MERCHANTS_GUILD, ACCESS_NKA)
+	required_access_download = list(ACCESS_MERCHANT, ACCESS_GOLDEN_DEEP, ACCESS_GOLDEN_DEEP_OWNED, ACCESS_MERCHANTS_GUILD, ACCESS_NKA)
 	tgui_id = "Merchant"
 	var/obj/machinery/merchant_pad/pad
 	var/current_merchant = 0

code/modules/modular_computers/computers/subtypes/preset_console.dm

@@ -176,15 +176,6 @@
 	ai_slot = new/obj/item/computer_hardware/ai_slot(src)
 	card_slot = new/obj/item/computer_hardware/card_slot(src)
 
-/obj/item/modular_computer/console/preset/merchant/nka
-	_app_preset_type = /datum/modular_computer_app_presets/merchant/nka
-
-/obj/item/modular_computer/console/preset/merchant/guild
-	_app_preset_type = /datum/modular_computer_app_presets/merchant/guild
-
-/obj/item/modular_computer/console/preset/merchant/golden_deep
-	_app_preset_type = /datum/modular_computer_app_presets/merchant/golden_deep
-
 // AI
 /obj/item/modular_computer/console/preset/ai
 	_app_preset_type = /datum/modular_computer_app_presets/ai

html/changelogs/Ben10083 - Merchant Gaming.yml

@@ -0,0 +1,59 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Ben10083
+
+# 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:
+  - refactor: "Refactored how merchant program is handled, removing need for various presets for each merchant faction."
+  - bugfix: "Minor fixes to Golden Deep Ship."

maps/away/ships/golden_deep/golden_deep.dmm

@@ -4105,7 +4105,7 @@
 /turf/simulated/floor/wood,
 /area/golden_deep/bridge_foyer)
 "qU" = (
-/obj/item/modular_computer/console/preset/merchant/golden_deep{
+/obj/item/modular_computer/console/preset/merchant{
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -12650,7 +12650,9 @@
 /area/golden_deep/portmaints)
 "ZV" = (
 /obj/machinery/light/small/floor,
-/obj/machinery/media/jukebox/gramophone,
+/obj/machinery/media/jukebox/gramophone{
+	anchored = 1
+	},
 /turf/simulated/floor/carpet/magenta,
 /area/golden_deep/merchant)
 "ZX" = (

maps/away/ships/hegemony/merchants_guild/merchant_freighter.dmm

@@ -817,7 +817,7 @@
 /turf/simulated/floor/plating,
 /area/merchants_guild/portengine)
 "ka" = (
-/obj/item/modular_computer/console/preset/merchant/guild{
+/obj/item/modular_computer/console/preset/merchant{
 	dir = 8
 	},
 /turf/simulated/floor/reinforced{

maps/away/ships/nka/nka_merchant/nka_merchant.dmm

@@ -5036,7 +5036,7 @@
 	},
 /area/nka_merchant/merchant)
 "GE" = (
-/obj/item/modular_computer/console/preset/merchant/nka{
+/obj/item/modular_computer/console/preset/merchant{
 	dir = 8
 	},
 /turf/simulated/floor/reinforced{