Skip to content

Commit

Permalink
Merge branch 'main' into no-path-track-oneway-arrows
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeLonewolf authored Sep 18, 2023
2 parents e051959 + 6510713 commit 07df658
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
4 changes: 4 additions & 0 deletions icons/shield_badge_crossbar_2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icons/shield_badge_crossbar_3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 19 additions & 5 deletions src/js/shield_defs.js
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,17 @@ export function loadShields() {
},
};

let badgeShieldCrossbar = {
spriteBlank: ["shield_badge_crossbar_2", "shield_badge_crossbar_3"],
textColor: Color.shields.black,
padding: {
left: 1,
right: 1,
top: 6,
bottom: 4,
},
};

// Default

shields["default"] = {
Expand Down Expand Up @@ -1181,11 +1192,14 @@ export function loadShields() {
"BUS",
]);

shields["US:US:Historic"] = {
...badgeShield,
textColor: Color.shields.brown,
colorLighten: Color.shields.brown,
};
shields["US:US:Historic"] = banneredShield(
{
...badgeShieldCrossbar,
textColor: Color.shields.brown,
colorLighten: Color.shields.brown,
},
["HIST"]
);

// Federal Agencies
shields["US:BIA"] = {
Expand Down

0 comments on commit 07df658

Please sign in to comment.