mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Fixes narsie and other singularities getting shuttle crushed (#17622)
* fix * OOP solutions
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user