Fixes narsie and other singularities getting shuttle crushed (#17622)

* fix

* OOP solutions
This commit is contained in:
Charlie
2022-04-20 12:27:42 +01:00
committed by GitHub
parent 58ee8f7562
commit ab46ce2626
4 changed files with 6 additions and 1 deletions
@@ -6,6 +6,7 @@
anchored = TRUE
density = TRUE
layer = MASSIVE_OBJ_LAYER
flags_2 = IMMUNE_TO_SHUTTLECRUSH_2
light_range = 6
appearance_flags = LONG_GLIDE
var/current_size = 1
@@ -85,7 +85,7 @@
icon_state = "darkmatter"
density = TRUE
anchored = TRUE
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 | IMMUNE_TO_SHUTTLECRUSH_2
light_range = 4
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
base_icon_state = "darkmatter"
+2
View File
@@ -595,6 +595,8 @@
for(var/atom/movable/AM in T1)
if(AM.pulledby)
AM.pulledby.stop_pulling()
if(AM.flags_2 & IMMUNE_TO_SHUTTLECRUSH_2)
continue
if(ismob(AM))
var/mob/M = AM
if(M.buckled)