Skip to content

Commit

Permalink
Water alpha fixes (#12924)
Browse files Browse the repository at this point in the history
* Water alpha fix

* fix capes

* shield filter priority
  • Loading branch information
Lumipharon authored May 9, 2023
1 parent e171f67 commit d225314
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions code/modules/clothing/modular_armor/attachments/cape.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/modular_armor/attachments/modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file modified icons/turf/alpha_64.dmi
Binary file not shown.

0 comments on commit d225314

Please sign in to comment.