Merge branch 'master' into disgustport

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

@@ -63,8 +63,20 @@
 /obj/effect/turf_decal/sand
 	icon_state = "sandyfloor"
 
+/obj/effect/turf_decal/sand/warning
+	icon_state = "sandy_warn"
+
+/obj/effect/turf_decal/sand/warning/corner
+	icon_state = "sandy_warn_corner"
+
 /obj/effect/turf_decal/sand/plating
 	icon_state = "sandyplating"
 
+/obj/effect/turf_decal/sand/plating/warning
+	icon_state = "sandy_plating_warn"
+
+/obj/effect/turf_decal/sand/plating/warning/corner
+	icon_state = "sandy_plating_warn_corner"
+
 /obj/effect/turf_decal/plaque
 	icon_state = "plaque"

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

@@ -20,12 +20,6 @@
 	pass_flags = PASSTABLE | PASSGRILLE
 	layer = FLY_LAYER
 
-/obj/effect/decal/sandeffect
-	name = "sandy tile"
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "sandeffect"
-	layer = ABOVE_OPEN_TURF_LAYER
-
 /obj/effect/decal/fakelattice
 	name = "lattice"
 	desc = "A lightweight support lattice."

code/game/objects/effects/effect_system/effects_foam.dm

@@ -21,7 +21,7 @@
 	var/static/list/blacklisted_turfs = typecacheof(list(
 	/turf/open/space/transit,
 	/turf/open/chasm,
-	/turf/open/floor/plating/lava))
+	/turf/open/lava))
 
 
 /obj/effect/particle_effect/foam/metal

code/game/objects/effects/effects.dm

@@ -3,7 +3,7 @@
 //Effects are mostly temporary visual effects like sparks, smoke, as well as decals, etc...
 /obj/effect
 	icon = 'icons/effects/effects.dmi'
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
 
 /obj/effect/attackby(obj/item/I, mob/living/user, params)
 	return

code/game/objects/effects/glowshroom.dm

@@ -16,7 +16,7 @@
 	var/spreadIntoAdjacentChance = 60
 	var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom
 	var/static/list/blacklisted_glowshroom_turfs = typecacheof(list(
-	/turf/open/floor/plating/lava,
+	/turf/open/lava,
 	/turf/open/floor/plating/beach/water))
 
 /obj/structure/glowshroom/glowcap

code/game/objects/effects/portals.dm

@@ -42,9 +42,6 @@
 	if(user && Adjacent(user))
 		teleport(user)
 
-/obj/effect/portal/make_frozen_visual()
-	return
-
 /obj/effect/portal/Crossed(atom/movable/AM, oldloc)
 	if(get_turf(oldloc) == get_turf(linked))
 		return ..()

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

@@ -78,56 +78,6 @@
 	animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
 	animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL)
 
-/obj/effect/temp_visual/ratvar/volt_hit
-	name = "volt blast"
-	layer = ABOVE_MOB_LAYER
-	duration = 8
-	icon_state = "volt_hit"
-	light_range = 1.5
-	light_power = 2
-	light_color = LIGHT_COLOR_ORANGE
-	var/mob/user
-	var/damage = 25
-
-/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster)
-	. = ..()
-	user = caster
-	if(user)
-		var/matrix/M = new
-		M.Turn(Get_Angle(src, user))
-		transform = M
-	INVOKE_ASYNC(src, .proc/volthit)
-
-/obj/effect/temp_visual/ratvar/volt_hit/proc/volthit()
-	if(user)
-		Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray)
-	var/hit_amount = 0
-	var/turf/T = get_turf(src)
-	for(var/mob/living/L in T)
-		if(is_servant_of_ratvar(L))
-			continue
-		var/obj/item/I = L.null_rod_check()
-		if(I)
-			L.visible_message("<span class='warning'>Strange energy flows into [L]'s [I.name]!</span>", \
-			"<span class='userdanger'>Your [I.name] shields you from [src]!</span>")
-			continue
-		L.visible_message("<span class='warning'>[L] is struck by a [name]!</span>", "<span class='userdanger'>You're struck by a [name]!</span>")
-		L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
-		add_logs(user, L, "struck with a volt blast")
-		hit_amount++
-	for(var/obj/mecha/M in T)
-		if(M.occupant)
-			if(is_servant_of_ratvar(M.occupant))
-				continue
-			to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
-		M.visible_message("<span class='warning'>[M] is struck by a [name]!</span>")
-		M.take_damage(damage, BURN, 0, 0)
-		hit_amount++
-	if(hit_amount)
-		playsound(src, 'sound/machines/defib_zap.ogg', damage*hit_amount, 1, -1)
-	else
-		playsound(src, "sparks", 50, 1)
-
 /obj/effect/temp_visual/ratvar/ocular_warden
 	name = "warden's gaze"
 	layer = ABOVE_MOB_LAYER
@@ -210,6 +160,20 @@
 	animate(src, transform = matrix()*2, time = 5)
 	animate(transform = oldtransform, alpha = 0, time = 65)
 
+/obj/effect/temp_visual/ratvar/sigil/transmission
+	color = "#EC8A2D"
+	layer = ABOVE_MOB_LAYER
+	duration = 20
+	light_range = 3
+	light_power = 1
+	light_color = "#EC8A2D"
+
+/obj/effect/temp_visual/ratvar/sigil/transmission/Initialize(mapload, transform_multiplier)
+	. = ..()
+	var/oldtransform = transform
+	transform = matrix()*transform_multiplier
+	animate(src, transform = oldtransform, alpha = 0, time = 20)
+
 /obj/effect/temp_visual/ratvar/sigil/vitality
 	color = "#1E8CE1"
 	icon_state = "sigilactivepulse"