WOW

2022-11-22 12:55:44 +01:00
parent 0c97b63c2a
commit bcfc53e348
2 changed files with 10 additions and 12 deletions
--- a/mods/shit_robocops/init.lua
+++ b/mods/shit_robocops/init.lua
@@ -1,10 +1,6 @@
 minetest.register_abm({
    nodenames = {"poop:grey_bricks"},
-<<<<<<< HEAD
-    interval = 40,
-=======
    interval = 30,
->>>>>>> 742042729b4e3926e0679e3f1775f92d22ae8461
    chance = 200,
    action = function(pos, node, active_object_count, active_object_count_wider)
 		minetest.add_entity({x = pos.x, y = pos.y + 1, z = pos.z}, "robocops:robocop")