Merge remote-tracking branch 'upstream/master' into bobross

2026-07-11 07:59:08 +01:00 · 2021-07-22 03:36:06 -03:00
parent b443f02b6d 97036e117f
commit 56fec5c4ba
51 changed files with 4354 additions and 4423 deletions
@@ -21,10 +21,13 @@
 		/obj/effect/particle_effect,
 		/obj/effect/light_emitter/tendril,
 		/obj/effect/collapse,
+		/obj/effect/cloud_collapse,
 		/obj/effect/particle_effect/ion_trails,
 		/obj/effect/dummy/phased_mob,
 		/obj/effect/immovablerod,
-		/obj/effect/crystalline_reentry
+		/obj/effect/crystalline_reentry,
+		/obj/effect/mapping_helpers,
+		/obj/effect/baseturf_helper
 		))

 /datum/component/chasm/Initialize(turf/target)