more merge conflict fixes

2020-01-24 10:14:31 +08:00
parent 379d5b9463 4888e1522a
commit 9761d68f4b
315 changed files with 15287 additions and 11002 deletions
@@ -43,6 +43,9 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "immrod"
 	throwforce = 100
+	move_force = INFINITY
+	move_resist = INFINITY
+	pull_force = INFINITY
 	density = TRUE
 	anchored = TRUE
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1