From 66942c91d8967ac0dc5a36ed6bbc3179f88d36d1 Mon Sep 17 00:00:00 2001 From: Ketrai Date: Mon, 17 May 2021 23:42:11 +0200 Subject: [PATCH] attempts to fix conflict --- .../_closets_appearance_definitions_vr.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm index 50b2c12f907..c0c3d104adb 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm @@ -65,7 +65,7 @@ ) /decl/closet_appearance/secure_closet/expedition - color = COLOR_BRASS + color = COLOR_OLIVE decals = list( "lower_side_vent" ) @@ -84,17 +84,15 @@ /decl/closet_appearance/secure_closet/expedition/explorer extra_decals = list( - "stripe_vertical_left_full" = COLOR_PURPLE, - "stripe_vertical_right_full" = COLOR_PURPLE, - "exped" = COLOR_PURPLE + "stripe_vertical_mid_full" = COLOR_GRAY40, + "exped" = COLOR_GRAY40 ) /decl/closet_appearance/secure_closet/expedition/pathfinder extra_decals = list( - "stripe_vertical_left_full" = COLOR_PURPLE, - "stripe_vertical_mid_full" = COLOR_GRAY40, - "stripe_vertical_right_full" = COLOR_PURPLE, - "exped" = COLOR_GRAY40 + "stripe_vertical_left_full" = COLOR_GRAY20, + "stripe_vertical_right_full" = COLOR_GRAY20, + "exped" = COLOR_GRAY20 ) /decl/closet_appearance/crate/fennec