Revert "Psionics Rework: Kyoushiki Murasaki (#16805)" (#16948)

This reverts commit 27c40bdaf6.

code/game/objects/effects/effect_system.dm

@@ -6,7 +6,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 */
 
 
-/obj/effect
+/obj/effect/effect
 	name = "effect"
 	icon = 'icons/effects/effects.dmi'
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT

code/game/objects/items/weapons/cigs_lighters.dm

@@ -105,7 +105,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 /obj/item/flame/match/proc/light()
 	lit = TRUE
-	damtype = "fire"
+	damtype = "burn"
 	icon_state = "match_lit"
 	item_state = "match_lit"
 	if(ismob(loc))

code/game/objects/structures/full_window_frame.dm

@@ -163,12 +163,6 @@
 		else
 			to_chat(user, SPAN_WARNING("You need at least [glass_needed] sheets of [MATERIAL_GLASS_REINFORCED_PHORON] to finished the window."))
 
-/obj/structure/window_frame/hitby(atom/movable/AM, speed)
-	. = ..()
-	var/obj/structure/window/W = locate() in get_turf(src)
-	if(istype(W))
-		W.hitby(AM)
-
 /obj/structure/window_frame/unanchored // Used during in-game construction.
 	should_check_mapload = FALSE // No glass.
 	anchored = FALSE