From 920533d6fb03683ec7f10d53801083b7bb5b1d5d Mon Sep 17 00:00:00 2001
From: Benedict <91219575+Ben10083@users.noreply.github.com>
Date: Thu, 14 Apr 2022 12:32:26 -0400
Subject: [PATCH] Space Bar Bugfix (#13495)

---
 code/game/objects/structures/barsign.dm     |  3 +-
 html/changelogs/ben10083-space_bar_fix.yml  | 41 +++++++++++++++++++++
 maps/away/generic/space_bar.dmm             |  5 ++-
 maps/sccv_horizon/sccv_horizon-2_deck_2.dmm |  3 +-
 4 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/ben10083-space_bar_fix.yml

diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 880229fdb93..a495bc8d91c 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -3,6 +3,7 @@
 	icon_state = "empty"
 	anchored = 1
 	var/cult = 0
+	req_access = list(access_bar) //Has to initalize at first, this is updated by instance's req_access
 
 /obj/structure/sign/double/barsign/proc/get_valid_states(initial=1)
 	. = icon_states(icon)
@@ -34,7 +35,7 @@
 
 	var/obj/item/card/id/card = I.GetID()
 	if(istype(card))
-		if(access_bar in card.GetAccess())
+		if(check_access(card))
 			var/sign_type = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states(0)
 			if(!sign_type)
 				return
diff --git a/html/changelogs/ben10083-space_bar_fix.yml b/html/changelogs/ben10083-space_bar_fix.yml
new file mode 100644
index 00000000000..7a42f2276b9
--- /dev/null
+++ b/html/changelogs/ben10083-space_bar_fix.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: 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, 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: "Barsign and Holo-menu should now work properly in the Space Bar."
diff --git a/maps/away/generic/space_bar.dmm b/maps/away/generic/space_bar.dmm
index ddc63d591d7..3ca09aedef0 100644
--- a/maps/away/generic/space_bar.dmm
+++ b/maps/away/generic/space_bar.dmm
@@ -477,7 +477,10 @@
 "fnY" = (
 /obj/structure/table/stone/marble,
 /obj/effect/floor_decal/corner/grey/diagonal,
-/obj/item/holomenu,
+/obj/item/holomenu{
+	req_access = list(202);
+	req_one_access = null
+	},
 /obj/structure/noticeboard{
 	dir = 8;
 	pixel_x = 32
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 9ccbaf608e0..443bca3376e 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -22257,7 +22257,8 @@
 	},
 /obj/structure/sign/double/barsign{
 	dir = 4;
-	pixel_x = -64
+	pixel_x = -64;
+	req_access = list(25)
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)