Merge pull request tgstation#52481 from ShizCalev/singularity-pull

move_resist INFINITY items/mobs can no longer be pulled by the singularity
Low3 · Jul 26, 2020 · 560067a · 560067a
2 parents 53c53d0 + 2c654fe
commit 560067a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
@@ -196,6 +196,8 @@
 
 /obj/singularity_pull(S, current_size)
 	..()
+	if(move_resist == INFINITY)
+		return
 	if(!anchored || current_size >= STAGE_FIVE)
 		step_towards(src,S)
 

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -942,6 +942,8 @@
 
 /mob/living/singularity_pull(S, current_size)
 	..()
+	if(move_resist == INFINITY)
+		return
 	if(current_size >= STAGE_SIX) //your puny magboots/wings/whatever will not save you against supermatter singularity
 		throw_at(S, 14, 3, src, TRUE)
 	else if(!src.mob_negates_gravity())