Skip to content

Commit

Permalink
Merge branch 'dev2.0' of https://github.com/modded-factorio/bobsmods
Browse files Browse the repository at this point in the history
…into dev2.0
  • Loading branch information
KiwiHawk committed Jan 12, 2025
2 parents 63c4611 + 5de1af8 commit 8886664
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bobmodules/prototypes/item/module-merged.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if settings.startup["bobmods-modules-enablegreenmodules"].value == true then
local module_color_map = {
["green"] = { primary = util.color("95e26c"), secondary = util.color("2bff2b") },
["green"] = { primary = util.color("95e26c"), secondary = util.color("2bff2b") },
}
data:extend({
{
Expand Down
10 changes: 5 additions & 5 deletions bobmodules/prototypes/item/module.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
local item_sounds = require("__base__.prototypes.item_sounds")
local module_color_map = {
["blue"] = { primary = util.color("70b6ff"), secondary = util.color("30d2ff") },
["brown"] = { primary = util.color("9c7c60"), secondary = util.color("fff0d9") },
["pine"] = { primary = util.color("7a9e96"), secondary = util.color("bfffd2") },
["red-yellow"] = { primary = util.color("f27c52"), secondary = util.color("ffe27c") },
["yellow"] = { primary = util.color("ffdd45"), secondary = util.color("ffed66") },
["blue"] = { primary = util.color("70b6ff"), secondary = util.color("30d2ff") },
["brown"] = { primary = util.color("9c7c60"), secondary = util.color("fff0d9") },
["pine"] = { primary = util.color("7a9e96"), secondary = util.color("bfffd2") },
["red-yellow"] = { primary = util.color("f27c52"), secondary = util.color("ffe27c") },
["yellow"] = { primary = util.color("ffdd45"), secondary = util.color("ffed66") },
}

--[[Speed Modules]]
Expand Down

0 comments on commit 8886664

Please sign in to comment.