cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix big smoke on cigarette exhale (and tram smashing apparently) (#88951)

Browse Source
This commit is contained in:
MrMelbert
2025-01-16 08:28:43 +00:00
committed by GitHub
parent f8056b24b5
commit 0e44baa921
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/particle_holder.dm
+4
View File
@@ -19,6 +19,10 @@
if(!loc)
stack_trace("particle holder was created with no loc!")
return INITIALIZE_HINT_QDEL
if(PLANE_TO_TRUE(loc.plane) == FLOOR_PLANE)
vis_flags &= ~VIS_INHERIT_PLANE // don't yoink the floor plane. we'll just sit on game plane, it's fine
// We nullspace ourselves because some objects use their contents (e.g. storage) and some items may drop everything in their contents on deconstruct.
parent = loc
loc = null
code/modules/transport/transport_module.dm
+1 -1
View File
@@ -386,7 +386,7 @@
if(QDELING(victim_structure))
continue
if(!is_type_in_typecache(victim_structure, transport_controller_datum.ignored_smashthroughs))
if((victim_structure.plane == FLOOR_PLANE && victim_structure.layer > TRAM_RAIL_LAYER) || (victim_structure.plane == GAME_PLANE && victim_structure.layer > LOW_OBJ_LAYER) )
if((PLANE_TO_TRUE(victim_structure.plane) == FLOOR_PLANE && victim_structure.layer > TRAM_RAIL_LAYER) || (PLANE_TO_TRUE(victim_structure.plane) == GAME_PLANE && victim_structure.layer > LOW_OBJ_LAYER) )
if(victim_structure.anchored && initial(victim_structure.anchored) == TRUE)
visible_message(span_danger("[src] smashes through [victim_structure]!"))
victim_structure.deconstruct(FALSE)