diff --git a/macrovision.css b/macrovision.css index 3a7294f7..cfc27228 100644 --- a/macrovision.css +++ b/macrovision.css @@ -865,7 +865,6 @@ option.filtered { button { border: 3px; - border-style: outset; } @@ -873,7 +872,6 @@ button:hover { background: #555; } button:enabled:active { - border-style: inset; background: #aaa; } @@ -902,7 +900,7 @@ button:enabled:active { } } -.nsfw { +body.flag-nsfw .nsfw { color: red; font-style: bold; } diff --git a/macrovision.js b/macrovision.js index 814dad2f..58fa489d 100644 --- a/macrovision.js +++ b/macrovision.js @@ -2838,6 +2838,18 @@ const settingsData = { toggleBodyClass("toggle-height-bars", param); } }, + "flag-nsfw": { + name: "Flag NSFW", + desc: "Highlight NSFW things in red", + type: "toggle", + default: false, + get value() { + return checkBodyClass("flag-nsfw"); + }, + set value(param) { + toggleBodyClass("flag-nsfw", param); + } + }, "glowing-entities": { name: "Glowing Edges", desc: "Makes all entities glow", diff --git a/media/attribution.js b/media/attribution.js index 7bc9bfe1..3cd8fd5f 100644 --- a/media/attribution.js +++ b/media/attribution.js @@ -19233,6 +19233,18 @@ const attributionData = { "corriezodori" ] }, + { + prefix: "./media/species/amogus/", + files: [ + { name: "amogus.svg", source: "http://thedailycougar.com/2020/10/29/among-us-popular-in-pandemic/" } + ], + authors: [ + "innersloth" + ], + owners: [ + "innersloth" + ] + }, { prefix: "./media/vehicles/", files: [ @@ -25439,6 +25451,10 @@ const attributionData = { "name": "Footpaws", "url": "https://www.furaffinity.net/user/footpaws/" }, + "innersloth": { + "name": "Innersloth", + "url": "https://www.innersloth.com/" + }, } } diff --git a/media/species/amogus/amogus.svg b/media/species/amogus/amogus.svg new file mode 100644 index 00000000..d1154086 --- /dev/null +++ b/media/species/amogus/amogus.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + diff --git a/presets/characters.js b/presets/characters.js index cb55989b..a82fe349 100644 --- a/presets/characters.js +++ b/presets/characters.js @@ -1912,6 +1912,10 @@ const speciesData = { name: "Ditto", parents: ["pokemon", "goo"] }, + "amogus": { + name: "Amogus", + parents: ["deity"] + }, } //species diff --git a/presets/species.js b/presets/species.js index d631ce0c..9c819297 100644 --- a/presets/species.js +++ b/presets/species.js @@ -622,7 +622,28 @@ speciesMakers["Zorgoia"] = () => makeCharacter( ] ) - +speciesMakers["Amogus"] = () => makeCharacter( + { name: "Amogus", species: [], tags: ["anthro"] }, + { + amogus: { + height: math.unit(3 + 6/12, "feet"), + weight: math.unit(92, "lb"), + name: "Amogus", + image: { + source: "./media/species/amogus/amogus.svg", + extra: 592/592, + bottom: 24/616 + } + }, + }, + [ + { + name: "Amogus", + height: math.unit(3 + 6/12, "feet"), + default: true + }, + ] +) function makeSpecies() { const results = [];