Fixed merge conflicts and made shit a falling node

2022-11-22 15:02:55 -05:00
parent f5f3af44e4
commit 346e410cfd
2 changed files with 8 additions and 8 deletions
--- a/mods/shit_robocops/init.lua
+++ b/mods/shit_robocops/init.lua
@@ -2,13 +2,9 @@ local numberOfCops = 0

 minetest.register_abm({
    nodenames = {"poop:grey_bricks"},
-<<<<<<< HEAD
+
    interval = 20,
    chance = 300,
-=======
-    interval = 30,
-    chance = 200,
->>>>>>> bcfc53e3489d47918c04d9ae562a665c71fc33ee
    action = function(pos, node, active_object_count, active_object_count_wider)
 		if numberOfCops < 50 then
 			minetest.add_entity({x = pos.x, y = pos.y + 1, z = pos.z}, "robocops:robocop")