Fixes conflicts

2026-08-23 03:57:13 +01:00 · 2018-11-11 16:10:11 -06:00
parent 2c7790b93d
commit 8a0f9e9424
2 changed files with 2 additions and 5 deletions
@@ -13,7 +13,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 	density = 0
 	canmove = 0
 	alpha = 127
-	anchored = 1	//  don't get pushed around
+	move_resist = INFINITY	//  don't get pushed around
 	invisibility = INVISIBILITY_OBSERVER
 	var/can_reenter_corpse
 	var/bootime = 0