Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:44:13 -05:00
379 changed files with 37535 additions and 33147 deletions
@@ -44,10 +44,10 @@
/obj/effect/anomaly/flux/detonate()
switch(emp_zap)
if(FLUX_EMP)
empulse(src, 4, 16)
empulse(src, 4, 16, emp_source = src)
explosion(src, heavy_impact_range = 1, light_impact_range = 4, flash_range = 6) //Trashes the room a bit, might blow a small hole in the hull.
if(FLUX_LIGHT_EMP)
empulse(src, 4, 6)
empulse(src, 4, 6, emp_source = src)
explosion(src, light_impact_range = 3, flash_range = 6)
if(FLUX_NO_EMP)
new /obj/effect/particle_effect/sparks(loc)
@@ -82,7 +82,7 @@
if(!isnull(broken_flooring))
return
var/turf/T = get_turf(src)
if(T.tiled_dirt && is_tileable)
if(T.tiled_turf && is_tileable)
icon = 'icons/effects/dirt.dmi'
icon_state = "dirt-0"
smoothing_flags = SMOOTH_BITMASK
@@ -12,14 +12,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
pass_flags = PASSTABLE | PASSGRILLE
anchored = TRUE
/obj/effect/particle_effect/Initialize(mapload)
. = ..()
GLOB.cameranet.updateVisibility(src)
/obj/effect/particle_effect/Destroy()
GLOB.cameranet.updateVisibility(src)
return ..()
// Prevents effects from getting registered for SSnewtonian_movement
/obj/effect/particle_effect/newtonian_move(inertia_angle, instant = FALSE, start_delay = 0, drift_force = 0, controlled_cap = null)
return TRUE
@@ -808,3 +808,21 @@
/obj/effect/temp_visual/circle_wave/star_blast
color = COLOR_VOID_PURPLE
/obj/effect/temp_visual/focus_ring
randomdir = FALSE
name = "ring"
icon_state = "focus_ring"
layer = BELOW_MOB_LAYER
duration = 2.5 SECONDS
pixel_y = -4
alpha = 0
/obj/effect/temp_visual/focus_ring/Initialize(mapload)
. = ..()
animate(src, alpha = 100, time = 2 SECONDS, easing = QUAD_EASING|EASE_IN)
addtimer(CALLBACK(src, PROC_REF(dissipate)), 2 SECONDS)
/obj/effect/temp_visual/focus_ring/proc/dissipate()
animate(src, alpha = 0, time = 0.5 SECONDS, easing = QUAD_EASING|EASE_OUT)