From 4483fa8f65222225265dbaf1b48d169d9cc4280f Mon Sep 17 00:00:00 2001
From: Bloop <13398309+vinylspiders@users.noreply.github.com>
Date: Fri, 13 Oct 2023 16:34:44 -0400
Subject: [PATCH] Fixes a misplaced outfit override that adds bra var (#24290)

Modular paths
---
 .../master_files/code/datums/{outfits.dm => outfit.dm}         | 2 ++
 modular_skyrat/modules/contractor/code/datums/outfit.dm        | 2 --
 tgstation.dme                                                  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename modular_skyrat/master_files/code/datums/{outfits.dm => outfit.dm} (69%)
 delete mode 100644 modular_skyrat/modules/contractor/code/datums/outfit.dm

diff --git a/modular_skyrat/master_files/code/datums/outfits.dm b/modular_skyrat/master_files/code/datums/outfit.dm
similarity index 69%
rename from modular_skyrat/master_files/code/datums/outfits.dm
rename to modular_skyrat/master_files/code/datums/outfit.dm
index 769348fccb7..6fd3e7afb15 100644
--- a/modular_skyrat/master_files/code/datums/outfits.dm
+++ b/modular_skyrat/master_files/code/datums/outfit.dm
@@ -1,3 +1,5 @@
 /datum/outfit
 	/// Bitflag-based variable to store which parts of the uniform have been modified by the loadout, to avoid them being overriden again.
 	var/modified_outfit_slots = NONE
+	/// Underwear and bras are separated now
+	var/datum/sprite_accessory/bra = null
diff --git a/modular_skyrat/modules/contractor/code/datums/outfit.dm b/modular_skyrat/modules/contractor/code/datums/outfit.dm
deleted file mode 100644
index 3364e2fbccb..00000000000
--- a/modular_skyrat/modules/contractor/code/datums/outfit.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/outfit
-    var/datum/sprite_accessory/bra = null
diff --git a/tgstation.dme b/tgstation.dme
index d705c8140d6..22b7e8f1e17 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5959,7 +5959,7 @@
 #include "modular_skyrat\master_files\code\datums\ai_laws.dm"
 #include "modular_skyrat\master_files\code\datums\emotes.dm"
 #include "modular_skyrat\master_files\code\datums\ert.dm"
-#include "modular_skyrat\master_files\code\datums\outfits.dm"
+#include "modular_skyrat\master_files\code\datums\outfit.dm"
 #include "modular_skyrat\master_files\code\datums\bodypart_overlays\bodypart_overlay.dm"
 #include "modular_skyrat\master_files\code\datums\bodypart_overlays\mutant_bodypart_overlay.dm"
 #include "modular_skyrat\master_files\code\datums\components\crafting.dm"
@@ -6634,7 +6634,6 @@
 #include "modular_skyrat\modules\contractor\code\datums\contractor_tablet.dm"
 #include "modular_skyrat\modules\contractor\code\datums\mind_datum.dm"
 #include "modular_skyrat\modules\contractor\code\datums\objective.dm"
-#include "modular_skyrat\modules\contractor\code\datums\outfit.dm"
 #include "modular_skyrat\modules\contractor\code\datums\midround\antag_datum.dm"
 #include "modular_skyrat\modules\contractor\code\datums\midround\event.dm"
 #include "modular_skyrat\modules\contractor\code\datums\midround\objective.dm"