diff --git a/changelog.txt b/changelog.txt index 640c65d15..e4eff5081 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,10 @@ --------------------------------------------------------------------------------------------------- Version: 1.1.1 -Date: 2020.12.XX +Date: 2020.12.25 Features: - Implemented the greenhouse - Added item icon for silicon plate, credit to Vigil for the sprite + - Added icons for calcium chloride, sodium hydroxide and alumina - Finished implementation of personal and vehicle equipment and related technologies, excluding those related to plasma cannons Changes: - Burner electric generator now lights up at night diff --git a/graphics/icons/plates/items/alumina.png b/graphics/icons/plates/items/alumina.png new file mode 100644 index 000000000..a6b3e34e5 Binary files /dev/null and b/graphics/icons/plates/items/alumina.png differ diff --git a/graphics/icons/plates/items/calcium-chloride.png b/graphics/icons/plates/items/calcium-chloride.png new file mode 100644 index 000000000..50cf4b8bb Binary files /dev/null and b/graphics/icons/plates/items/calcium-chloride.png differ diff --git a/graphics/icons/plates/items/sodium-hydroxide.png b/graphics/icons/plates/items/sodium-hydroxide.png new file mode 100644 index 000000000..74b47b57a Binary files /dev/null and b/graphics/icons/plates/items/sodium-hydroxide.png differ diff --git a/prototypes/item/plates.lua b/prototypes/item/plates.lua index 892c0081b..93f510fb0 100644 --- a/prototypes/item/plates.lua +++ b/prototypes/item/plates.lua @@ -101,6 +101,9 @@ local intermediaries = { ["rubber"] = {mod = "lib", group = "shared", subgroup = "items"}, -- Shared with Bob's Electronics, Angels ["resin"] = {subgroup = "items"}, -- Shared with Bob's Electronics ["enriched-fuel"] = {subgroup = "items"}, + ["alumina"] = {subgroup = "items"}, + ["calcium-chloride"] = {subgroup = "items"}, + ["sodium-hydroxide"] = {subgroup = "items"}, ---------------------------------------------------------------------------------------------------- -- Recipes diff --git a/prototypes/item/revamp.lua b/prototypes/item/revamp.lua index 7c6594fa2..6065f033c 100644 --- a/prototypes/item/revamp.lua +++ b/prototypes/item/revamp.lua @@ -24,4 +24,12 @@ if not mods["bobplates"] then intermediaries["solid-fuel-from-sour-gas"] = {type = "recipe", group = "plates", subgroup = "recipes"} end -reskins.lib.create_icons_from_list(intermediaries, inputs) \ No newline at end of file +reskins.lib.create_icons_from_list(intermediaries, inputs) + +local composite_recipes = { + ["ammonium-chloride-recycling"] = {["ammonium-chloride"] = {}, ["ammonia"] = {type = "fluid", scale = 0.375, shift = {-10, 11}}, ["calcium-chloride"] = {scale = 0.375, shift = {10, 11}}}, +} + +for name, sources in pairs(composite_recipes) do + reskins.lib.composite_existing_icons(name, "recipe", sources) +end \ No newline at end of file diff --git a/settings.lua b/settings.lua index 3e6cb2167..49fb22cbe 100644 --- a/settings.lua +++ b/settings.lua @@ -217,6 +217,7 @@ if mods["bobtech"] then name = "reskins-bobs-show-alien-decoratives-on-lab", setting_type = "startup", default_value = true, + hidden = true, }, }) end