Merge branch 'master' into upstream-merge-32161

code/game/objects/effects/decals/crayon.dm

@@ -5,20 +5,26 @@
 	icon_state = "rune1"
 	gender = NEUTER
 	var/do_icon_rotate = TRUE
+	var/rotation = 0
+	var/paint_colour = "#FFFFFF"
 
-/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null)
+/obj/effect/decal/cleanable/crayon/Initialize(mapload, main, type, e_name, graf_rot, alt_icon = null)
 	. = ..()
 
-	name = e_name
+	if(e_name)
+		name = e_name
 	desc = "A [name] vandalizing the station."
 
 	if(alt_icon)
 		icon = alt_icon
-	icon_state = type
-
+	if(type)
+		icon_state = type
+	if(graf_rot)
+		rotation = graf_rot
 	if(rotation && do_icon_rotate)
 		var/matrix/M = matrix()
 		M.Turn(rotation)
 		src.transform = M
-
-	add_atom_colour(main, FIXED_COLOUR_PRIORITY)
+	if(main)
+		paint_colour = main
+	add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)

code/game/objects/effects/decals/decal.dm

@@ -15,24 +15,23 @@
 	if(T == loc && (isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || ischasm(T)))
 		qdel(src)
 
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 /obj/effect/turf_decal
-	var/group = TURF_DECAL_PAINT
 	icon = 'icons/turf/decals.dmi'
 	icon_state = "warningline"
 	layer = TURF_DECAL_LAYER
-	anchored = TRUE
-
-//in case we need some special decals
-/obj/effect/turf_decal/proc/get_decal()
-	return image(icon='icons/turf/decals.dmi',icon_state=icon_state,dir=dir,layer=TURF_LAYER)
 
 /obj/effect/turf_decal/Initialize()
 	..()
+	return INITIALIZE_HINT_QDEL
+
+/obj/effect/turf_decal/ComponentInitialize()
+	. = ..()
 	var/turf/T = loc
 	if(!istype(T)) //you know this will happen somehow
 		CRASH("Turf decal initialized in an object/nullspace")
-	T.add_decal(get_decal(),group)
-	return INITIALIZE_HINT_QDEL
+	T.AddComponent(/datum/component/turf_decal, dir, icon, icon_state)
 
 /obj/effect/turf_decal/stripes/line
 	icon_state = "warningline"

code/game/objects/effects/portals.dm

@@ -124,7 +124,7 @@
 	return ..()
 
 /obj/effect/portal/proc/teleport(atom/movable/M)
-	if(!istype(M) || istype(M, /obj/effect) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport.
+	if(!istype(M) || istype(M, /obj/effect) || isobserver(M) || (ismecha(M) && !mech_sized) || (!isobj(M) && !ismob(M))) //Things that shouldn't teleport.
 		return
 	var/turf/real_target = get_link_target_turf()
 	if(!istype(real_target))

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

@@ -312,14 +312,10 @@
 	icon_state = "impact_bullet"
 	duration = 5
 
-/obj/effect/temp_visual/impact_effect/Initialize(mapload, atom/target, obj/item/projectile/P)
-	if(target == P.original)
-		pixel_x = target.pixel_x + P.p_x - 16
-		pixel_y = target.pixel_y + P.p_y - 16
-	else
-		pixel_x = target.pixel_x + rand(2, -2)
-		pixel_y = target.pixel_y + rand(2, -2)
-	. = ..()
+/obj/effect/temp_visual/impact_effect/Initialize(mapload, x, y)
+	pixel_x = x
+	pixel_y = y
+	return ..()
 
 /obj/effect/temp_visual/impact_effect/red_laser
 	icon_state = "impact_laser"

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

@@ -35,3 +35,5 @@
 	if(set_dir)
 		setDir(set_dir)
 	. = ..()
+
+