Skip to content

Commit

Permalink
Fixes a misplaced outfit override that adds bra var (#24290)
Browse files Browse the repository at this point in the history
Modular paths
  • Loading branch information
vinylspiders authored and Iajret committed Oct 13, 2023
1 parent a61f374 commit 4483fa8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions modular_skyrat/modules/contractor/code/datums/outfit.dm

This file was deleted.

3 changes: 1 addition & 2 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 4483fa8

Please sign in to comment.