Merge branch 'master' into glassware

2020-01-23 13:31:04 -05:00
parent 181984f478 14a33ee7dc
commit 9466b0f4ca
554 changed files with 19713 additions and 12833 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