From 476d0d8699af037ea9e7374fc092a9ea524c5c3e Mon Sep 17 00:00:00 2001
From: SierraKomodo <11140088+SierraKomodo@users.noreply.github.com>
Date: Sun, 17 Mar 2024 17:14:36 +0300
Subject: [PATCH 1/2] [MIRROR] Barsigns now start always showing closed

---
 code/game/objects/structures/barsign.dm | 26 +++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 6b9eee32e876f..a8da93f7f73da 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -1,11 +1,11 @@
 /obj/structure/sign/double/barsign
 	desc = "A jumbo-sized LED sign. This one seems to be showing its age."
 	icon = 'icons/obj/structures/barsigns.dmi'
-	icon_state = "on"
+	icon_state = "Closed"
 	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 	anchored = TRUE
-	var/cult = 0
 
+<<<<<<< ours
 /obj/structure/sign/double/barsign/proc/get_valid_states(initial=1)
 	. = icon_states(icon)
 	. -= "on"
@@ -13,6 +13,8 @@
 	. -= "empty"
 	if(initial)
 		. -= "Off"
+=======
+>>>>>>> theirs
 
 /obj/structure/sign/double/barsign/examine(mob/user)
 	. = ..()
@@ -56,23 +58,15 @@
 		else
 			to_chat(user, "It says '[icon_state]'")
 
-/obj/structure/sign/double/barsign/New()
-	..()
-	icon_state = pick(get_valid_states())
-
 
 /obj/structure/sign/double/barsign/use_tool(obj/item/tool, mob/user, list/click_params)
-	// ID Card - Change barsign
 	var/obj/item/card/id/id = tool.GetIdCard()
 	if (istype(id))
 		var/id_name = GET_ID_NAME(id, tool)
 		if (!check_access(id))
 			USE_FEEDBACK_ID_CARD_DENIED(src, id_name)
 			return TRUE
-		if (cult)
-			USE_FEEDBACK_FAILURE("\The [src]'s display can't be changed.")
-			return TRUE
-		var/input = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states(FALSE)
+		var/input = input(user, "What would you like to change the barsign to?") as null|anything in get_valid_states()
 		if (!input || input == icon_state || !user.use_sanity_check(src, tool))
 			return TRUE
 		icon_state = input
@@ -81,5 +75,13 @@
 			SPAN_NOTICE("You update \the [src]'s display with [id_name].")
 		)
 		return TRUE
-
 	return ..()
+
+
+/obj/structure/sign/double/barsign/proc/get_valid_states()
+	return icon_states(icon) - list(
+		"",
+		"empty",
+		"narsiebistro",
+		"on"
+	)

From 2ef271ec0f555c85e2cecec09c4172174dfcd7e9 Mon Sep 17 00:00:00 2001
From: UEDCommander <52104104+UEDCommander@users.noreply.github.com>
Date: Wed, 22 May 2024 21:38:31 +0300
Subject: [PATCH 2/2] Update barsign.dm

---
 code/game/objects/structures/barsign.dm | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index a8da93f7f73da..a76b21f9e29cc 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -5,17 +5,6 @@
 	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 	anchored = TRUE
 
-<<<<<<< ours
-/obj/structure/sign/double/barsign/proc/get_valid_states(initial=1)
-	. = icon_states(icon)
-	. -= "on"
-	. -= "narsiebistro"
-	. -= "empty"
-	if(initial)
-		. -= "Off"
-=======
->>>>>>> theirs
-
 /obj/structure/sign/double/barsign/examine(mob/user)
 	. = ..()
 	switch(icon_state)
@@ -80,7 +69,6 @@
 
 /obj/structure/sign/double/barsign/proc/get_valid_states()
 	return icon_states(icon) - list(
-		"",
 		"empty",
 		"narsiebistro",
 		"on"