From 24ce12f37afd294b83bd25dd44135bd131c1093c Mon Sep 17 00:00:00 2001 From: Lumipharon Date: Mon, 8 May 2023 15:11:59 +1200 Subject: [PATCH 1/3] Water alpha fix --- icons/turf/alpha_64.dmi | Bin 445 -> 450 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/turf/alpha_64.dmi b/icons/turf/alpha_64.dmi index a90b8ed06c39f80d6a2a05d47ef55bfd69c59169..55f85fcd0e31883d737b6bac0eeb16cbfc01342e 100644 GIT binary patch delta 187 zcmdnXe296%dV_zSE{-7;bKc(B$a&a7gyo`bp{S&C$UpvG=IJRSD>``7;#j*S_&E92 z&g|UL_l==+;z#pIj3T;gRn~v&ST^(LR&$fwdVz!6nC%%SZSZf9V7TS=DYHLg*38v= z7iOwk-d4WyI9*|~AfxysMjnqlUZ3*&HLAC>o4ozjVD@WiL=8jZ{Z12x3Wj~mD)+xN ns4-W}W1Kd>v4D*sodH6aJNy;y6S|br%>V?Ru6{1-oD!M<)$>b% delta 226 zcmX@ayq9^xdcB{XE{-7;bKc(B$lGEd!gA5H$TjA`)c=Q-7pku7;Z2KUmG05eiCizopr0LVyD?EnA( From 5f535552b6f4126655ae99c1c7be27a5a0b78195 Mon Sep 17 00:00:00 2001 From: Lumipharon Date: Mon, 8 May 2023 15:51:04 +1200 Subject: [PATCH 2/3] fix capes --- code/modules/clothing/modular_armor/attachments/cape.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/modular_armor/attachments/cape.dm b/code/modules/clothing/modular_armor/attachments/cape.dm index fd6f2c68e29d4..7763053c93b5b 100644 --- a/code/modules/clothing/modular_armor/attachments/cape.dm +++ b/code/modules/clothing/modular_armor/attachments/cape.dm @@ -13,6 +13,7 @@ secondary_color = TRUE attachments_by_slot = list(ATTACHMENT_SLOT_CAPE_HIGHLIGHT) starting_attachments = list(/obj/item/armor_module/greyscale/cape_highlight) + appearance_flags = KEEP_APART|TILE_BOUND ///True if the hood is up, false if not. var/hood = FALSE From bd8000aa87252b8b9b453969502f4524d5f75a69 Mon Sep 17 00:00:00 2001 From: Lumipharon Date: Mon, 8 May 2023 16:00:16 +1200 Subject: [PATCH 3/3] shield filter priority --- .../modules/clothing/modular_armor/attachments/modules.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/modular_armor/attachments/modules.dm b/code/modules/clothing/modular_armor/attachments/modules.dm index adbdf7f55de04..136fa351c6abd 100644 --- a/code/modules/clothing/modular_armor/attachments/modules.dm +++ b/code/modules/clothing/modular_armor/attachments/modules.dm @@ -377,11 +377,11 @@ shield_health = shield_left switch(shield_left / max_shield_health) if(0 to 0.33) - affected.add_filter("eshield", 1, outline_filter(1, shield_color_low)) + affected.add_filter("eshield", 2, outline_filter(1, shield_color_low)) if(0.33 to 0.66) - affected.add_filter("eshield", 1, outline_filter(1, shield_color_mid)) + affected.add_filter("eshield", 2, outline_filter(1, shield_color_mid)) if(0.66 to 1) - affected.add_filter("eshield", 1, outline_filter(1, shield_color_full)) + affected.add_filter("eshield", 2, outline_filter(1, shield_color_full)) spark_system.start() else shield_health = 0 @@ -420,7 +420,7 @@ return var/mob/living/affected = parent.loc affected.remove_filter("eshield") - affected.add_filter("eshield", 1, outline_filter(1, new_color)) + affected.add_filter("eshield", 2, outline_filter(1, new_color)) //original Martian design, donutsteel /obj/item/armor_module/module/eshield/som