fixes merge conflict in custom_grenades.dm

code/game/objects/effects/effects.dm

@@ -4,3 +4,11 @@
 
 /obj/effect
 	icon = 'icons/effects/effects.dmi'
+	burn_state = LAVA_PROOF | FIRE_PROOF
+	resistance_flags = INDESTRUCTIBLE
+
+/obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
+	return
+
+/obj/effect/fire_act()
+	return

code/game/objects/effects/temporary_visuals/clockcult.dm

@@ -0,0 +1,23 @@
+//temporary visual effects(/obj/effect/temp_visual) used by clockcult stuff
+/obj/effect/temp_visual/ratvar
+	name = "ratvar's light"
+	icon = 'icons/effects/clockwork_effects.dmi'
+	duration = 8
+	randomdir = 0
+	layer = ABOVE_NORMAL_TURF_LAYER
+
+/obj/effect/temp_visual/ratvar/beam
+	icon_state = "ratvarbeamglow"
+
+/obj/effect/temp_visual/ratvar/beam/grille
+	layer = BELOW_OBJ_LAYER
+
+/obj/effect/temp_visual/ratvar/floor
+	icon_state = "ratvarfloorglow"
+
+/obj/effect/temp_visual/ratvar/grille
+	icon_state = "ratvargrilleglow"
+	layer = BELOW_OBJ_LAYER
+
+/obj/effect/temp_visual/ratvar/grille/broken
+	icon_state = "ratvarbrokengrilleglow"