From 3b40ea48d82e625998d6fb0d6a3c342517548326 Mon Sep 17 00:00:00 2001
From: RaShCAt <shendelyr@mail.ru>
Date: Sat, 16 Dec 2023 22:14:38 +0300
Subject: [PATCH 1/5] I think i'm good man

---
 tff_modular/modules/barsigns/code/barsigns.dm  |  17 +++++++++++++++++
 .../modules/barsigns/icons/barsigns.dmi        | Bin 0 -> 8128 bytes
 tgstation.dme                                  |   1 +
 3 files changed, 18 insertions(+)
 create mode 100644 tff_modular/modules/barsigns/code/barsigns.dm
 create mode 100644 tff_modular/modules/barsigns/icons/barsigns.dmi

diff --git a/tff_modular/modules/barsigns/code/barsigns.dm b/tff_modular/modules/barsigns/code/barsigns.dm
new file mode 100644
index 00000000000..9e6edfa2bab
--- /dev/null
+++ b/tff_modular/modules/barsigns/code/barsigns.dm
@@ -0,0 +1,17 @@
+// Modularly copypaste-set the correct icon file
+/obj/machinery/barsign/update_icon_state()
+	. = ..()
+	// Try to use TFF override
+	if(istype(chosen_sign, /datum/barsign/fluffy))
+		icon = 'tff_modular/modules/barsigns/icons/barsigns.dmi'
+		return
+
+/datum/barsign/fluffy/thelastlight
+	name = "The Last Light"
+	icon_state = "lastlight"
+	neon_color = "#EBB823"
+
+/datum/barsign/fluffy/afterlife
+	name = "After Life"
+	icon_state = "afterlife"
+	neon_color = "#3bfa74"
diff --git a/tff_modular/modules/barsigns/icons/barsigns.dmi b/tff_modular/modules/barsigns/icons/barsigns.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..4db1a7d60807b825e4236d703d67c3103f9ab4af
GIT binary patch
literal 8128
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

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index d00d817d161..b40103eeb04 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -8047,6 +8047,7 @@
 #include "tff_modular\master_files\code\modules\mod\mod_clothes.dm"
 #include "tff_modular\master_files\code\modules\reagents\recipe\coagulant_recipe.dm"
 #include "tff_modular\modules\autoaccent\code\autoaccent.dm"
+#include "tff_modular\modules\barsigns\code\barsigns.dm"
 #include "tff_modular\modules\blooper\atoms_movable.dm"
 #include "tff_modular\modules\blooper\bark.dm"
 #include "tff_modular\modules\blooper\bark_list.dm"

From f9dbdabc73da55c7d8916dc7228ef29272931d07 Mon Sep 17 00:00:00 2001
From: RaShCAt <shendelyr@mail.ru>
Date: Sat, 16 Dec 2023 22:40:07 +0300
Subject: [PATCH 2/5] =?UTF-8?q?=D0=90=20=D0=B5=D1=81=D0=BB=D0=B8=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BA=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/modules/unit_tests/barsigns.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/unit_tests/barsigns.dm b/code/modules/unit_tests/barsigns.dm
index 0914522446f..1c36d1ea0a7 100644
--- a/code/modules/unit_tests/barsigns.dm
+++ b/code/modules/unit_tests/barsigns.dm
@@ -9,6 +9,7 @@
 	var/icon/barsign_icon = initial(barsign_type.icon)
 	var/list/barsign_icon_states = icon_states(barsign_icon)
 	barsign_icon_states += icon_states(SKYRAT_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns
+	barsign_icon_states += icon_states('tff_modular/modules/barsigns/icons/barsigns.dmi') // THE FLUFFY FRONTIER - Need to check modular barsigns
 	barsign_icon_states += icon_states(SKYRAT_LARGE_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular  barsigns
 
 	// Check every datum real bar sign

From bd8da0b337929df0087ed9e295e0bb3fe1f369d3 Mon Sep 17 00:00:00 2001
From: RaShCAt <shendelyr@mail.ru>
Date: Sat, 16 Dec 2023 23:02:32 +0300
Subject: [PATCH 3/5] =?UTF-8?q?=D0=A2=D0=B0=D0=BA=20=D0=B8=20=D0=BD=D0=B5?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BD=D1=8F=D0=BB,=20=D0=BF=D0=BE=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BC=D1=83=20=D1=8D=D1=82=D0=BE=20"=D1=87=D0=B5=D1=80=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B9=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/modules/unit_tests/barsigns.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/unit_tests/barsigns.dm b/code/modules/unit_tests/barsigns.dm
index 1c36d1ea0a7..281f76a3fec 100644
--- a/code/modules/unit_tests/barsigns.dm
+++ b/code/modules/unit_tests/barsigns.dm
@@ -2,7 +2,7 @@
  * Test if icon states for each datum actually exist in the DMI.
  */
 /datum/unit_test/barsigns_icon
-	var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns
+	var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns
 
 /datum/unit_test/barsigns_icon/Run()
 	var/obj/machinery/barsign_type = /obj/machinery/barsign
@@ -27,7 +27,7 @@
  * Check that bar signs have a name and desc, and that the name is unique.
  */
 /datum/unit_test/barsigns_name
-	var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns
+	var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns
 
 /datum/unit_test/barsigns_name/Run()
 	var/list/existing_names = list()

From 2c9541b1985b1f5983c9de1df3527d3a47a1d649 Mon Sep 17 00:00:00 2001
From: RaShCAt <shendelyr@mail.ru>
Date: Sun, 17 Dec 2023 18:41:46 +0300
Subject: [PATCH 4/5] Maybe like that?

---
 code/modules/unit_tests/barsigns.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/unit_tests/barsigns.dm b/code/modules/unit_tests/barsigns.dm
index 281f76a3fec..9ed968331cb 100644
--- a/code/modules/unit_tests/barsigns.dm
+++ b/code/modules/unit_tests/barsigns.dm
@@ -9,7 +9,6 @@
 	var/icon/barsign_icon = initial(barsign_type.icon)
 	var/list/barsign_icon_states = icon_states(barsign_icon)
 	barsign_icon_states += icon_states(SKYRAT_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns
-	barsign_icon_states += icon_states('tff_modular/modules/barsigns/icons/barsigns.dmi') // THE FLUFFY FRONTIER - Need to check modular barsigns
 	barsign_icon_states += icon_states(SKYRAT_LARGE_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular  barsigns
 
 	// Check every datum real bar sign

From 2796c8abb4a4bdb9d32d3ec5c04c0d915edcdb3d Mon Sep 17 00:00:00 2001
From: RaShCAt <shendelyr@mail.ru>
Date: Sun, 17 Dec 2023 20:25:08 +0300
Subject: [PATCH 5/5] Okay

---
 code/__DEFINES/~ff_defines/barsigns.dm        | 1 +
 code/modules/unit_tests/barsigns.dm           | 1 +
 tff_modular/modules/barsigns/code/barsigns.dm | 2 +-
 tgstation.dme                                 | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 code/__DEFINES/~ff_defines/barsigns.dm

diff --git a/code/__DEFINES/~ff_defines/barsigns.dm b/code/__DEFINES/~ff_defines/barsigns.dm
new file mode 100644
index 00000000000..4ce039ae564
--- /dev/null
+++ b/code/__DEFINES/~ff_defines/barsigns.dm
@@ -0,0 +1 @@
+#define TFF_BARSIGN_FILE 'tff_modular/modules/barsigns/icons/barsigns.dmi'
diff --git a/code/modules/unit_tests/barsigns.dm b/code/modules/unit_tests/barsigns.dm
index 9ed968331cb..dc667a53ba6 100644
--- a/code/modules/unit_tests/barsigns.dm
+++ b/code/modules/unit_tests/barsigns.dm
@@ -9,6 +9,7 @@
 	var/icon/barsign_icon = initial(barsign_type.icon)
 	var/list/barsign_icon_states = icon_states(barsign_icon)
 	barsign_icon_states += icon_states(SKYRAT_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns
+	barsign_icon_states += icon_states(TFF_BARSIGN_FILE) // THE FLUFFY FRONTIER - Need to check modular barsigns
 	barsign_icon_states += icon_states(SKYRAT_LARGE_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular  barsigns
 
 	// Check every datum real bar sign
diff --git a/tff_modular/modules/barsigns/code/barsigns.dm b/tff_modular/modules/barsigns/code/barsigns.dm
index 9e6edfa2bab..21af38609f4 100644
--- a/tff_modular/modules/barsigns/code/barsigns.dm
+++ b/tff_modular/modules/barsigns/code/barsigns.dm
@@ -3,7 +3,7 @@
 	. = ..()
 	// Try to use TFF override
 	if(istype(chosen_sign, /datum/barsign/fluffy))
-		icon = 'tff_modular/modules/barsigns/icons/barsigns.dmi'
+		icon = TFF_BARSIGN_FILE
 		return
 
 /datum/barsign/fluffy/thelastlight
diff --git a/tgstation.dme b/tgstation.dme
index b40103eeb04..9ffc9edd714 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -377,6 +377,7 @@
 #include "code\__DEFINES\traits\declarations.dm"
 #include "code\__DEFINES\traits\macros.dm"
 #include "code\__DEFINES\traits\sources.dm"
+#include "code\__DEFINES\~ff_defines\barsigns.dm"
 #include "code\__DEFINES\~ff_defines\DNA.dm"
 #include "code\__DEFINES\~ff_defines\nabber_clothes_pathes.dm"
 #include "code\__DEFINES\~ff_defines\say.dm"