TGS Test Merge (#6821)

cmss13-devs · Aug 5, 2024 · 12955b1 · 12955b1
2 parents 99ac6ff + c4e3d95
commit 12955b1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/code/datums/ammo/shrapnel.dm b/code/datums/ammo/shrapnel.dm
@@ -122,16 +122,36 @@
 	name = "glass shrapnel"
 	icon_state = "shrapnel_glass"
 
-/datum/ammo/bullet/shrapnel/light/effect/ // no damage, but looks bright and neat
-	name = "sparks"
-
-	damage = 1 // Tickle tickle
+/particles/shrapnel
+	icon = 'icons/obj/items/weapons/projectiles.dmi'
+	icon_state = "shrapnel_bright2"
+	width = 1000
+	height = 1000
+	count = 100
+	spawning = 0
+	lifespan = 0.6 SECONDS
+	fadein = 0.2 SECONDS
+	velocity = generator("square", 32 * 0.85, 32 * 1.15)
+	rotation = generator("num", 0, 359)
+
+/obj/shrapnel_effect
+	anchored = TRUE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	unacidable = TRUE
+	blocks_emissive = EMISSIVE_BLOCK_GENERIC
+
+/obj/shrapnel_effect/New()
+	. = ..()
+	particles = new /particles/shrapnel
+	particles.spawning = rand(5,9) + rand(5,9)
+	addtimer(CALLBACK(src, PROC_REF(stop)), 0.1 SECONDS)
+	QDEL_IN(src, 0.9 SECONDS)
 
-/datum/ammo/bullet/shrapnel/light/effect/ver1
-	icon_state = "shrapnel_bright1"
+/obj/shrapnel_effect/proc/stop()
+	particles.spawning = 0
 
-/datum/ammo/bullet/shrapnel/light/effect/ver2
-	icon_state = "shrapnel_bright2"
+/obj/shrapnel_effect/get_applying_acid_time()
+	return -1
 
 /datum/ammo/bullet/shrapnel/jagged
 	shrapnel_chance = SHRAPNEL_CHANCE_TIER_2

diff --git a/code/datums/autocells/explosion.dm b/code/datums/autocells/explosion.dm
@@ -295,8 +295,7 @@ as having entered the turf.
 
 	if(power >= 100) // powerful explosions send out some special effects
 		epicenter = get_turf(epicenter) // the ex_acts might have changed the epicenter
-		create_shrapnel(epicenter, rand(5,9), , ,/datum/ammo/bullet/shrapnel/light/effect/ver1, explosion_cause_data)
-		create_shrapnel(epicenter, rand(5,9), , ,/datum/ammo/bullet/shrapnel/light/effect/ver2, explosion_cause_data)
+		new /obj/shrapnel_effect(epicenter)
 
 /proc/log_explosion(atom/A, datum/automata_cell/explosion/E)
 	if(isliving(A))

diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm
@@ -86,9 +86,7 @@ explosion resistance exactly as much as their health
 
 	if(power >= 100) // powerful explosions send out some special effects
 		epicenter = get_turf(epicenter) // the ex_acts might have changed the epicenter
-		create_shrapnel(epicenter, rand(5,9), , ,/datum/ammo/bullet/shrapnel/light/effect/ver1, explosion_cause_data)
-		sleep(1)
-		create_shrapnel(epicenter, rand(5,9), , ,/datum/ammo/bullet/shrapnel/light/effect/ver2, explosion_cause_data)
+		new /obj/shrapnel_effect(epicenter)
 
 	spawn(2) //just in case something goes wrong
 		if(explosion_in_progress)

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -337,12 +337,6 @@
 
 	//Animate the visuals from starting position to new position
 
-	if(projectile_flags & PROJECTILE_SHRAPNEL) //there can be a LOT of shrapnel especially from a cluster OB, not important enough for the expense of an animate()
-		alpha = alpha_new
-		pixel_x = pixel_x_rel_new
-		pixel_y = pixel_y_rel_new
-		return
-
 	var/anim_time = delta_time * 0.1
 	animate(src, pixel_x = pixel_x_rel_new, pixel_y = pixel_y_rel_new, alpha = alpha_new, time = anim_time, flags = ANIMATION_END_NOW)