more stuff

cmss13-devs · Jun 17, 2024 · b8ba723 · b8ba723
1 parent 5a0764e
commit b8ba723
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm
@@ -261,19 +261,19 @@
 
 /datum/ammo/rocket/wp/quad/on_hit_mob(mob/mob, obj/projectile/projectile)
 	drop_flame(get_turf(mob), projectile.weapon_cause_data)
-	explosion(projectile.loc,  -1, 2, 4, 5, , , ,projectile.weapon_cause_data)
+	cell_explosion(epicenter, 200, 32, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 
 /datum/ammo/rocket/wp/quad/on_hit_obj(obj/object, obj/projectile/projectile)
 	drop_flame(get_turf(object), projectile.weapon_cause_data)
-	explosion(projectile.loc,  -1, 2, 4, 5, , , ,projectile.weapon_cause_data)
+	cell_explosion(epicenter, 200, 32, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 
 /datum/ammo/rocket/wp/quad/on_hit_turf(turf/turf, obj/projectile/projectile)
 	drop_flame(turf, projectile.weapon_cause_data)
-	explosion(projectile.loc,  -1, 2, 4, 5, , , ,projectile.weapon_cause_data)
+	cell_explosion(epicenter, 200, 32, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 
 /datum/ammo/rocket/wp/quad/do_at_max_range(obj/projectile/projectile)
 	drop_flame(get_turf(projectile), projectile.weapon_cause_data)
-	explosion(projectile.loc,  -1, 2, 4, 5, , , ,projectile.weapon_cause_data)
+	cell_explosion(epicenter, 200, 32, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, projectile.weapon_cause_data)
 
 /datum/ammo/rocket/custom
 	name = "custom rocket"

diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
@@ -81,7 +81,6 @@
 	s.start()
 
 	deconstruct(FALSE)
-	explosion(src.loc,-1,-1,0)
 
 /obj/structure/machinery/deployable/barrier/deconstruct(disassembled = TRUE)
 	if(!disassembled)

diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
@@ -640,9 +640,9 @@
 		flame_radius(cause_data, 3, target, , , , , )
 		cell_explosion(target, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		flame_radius(cause_data, 3, target_2, , , , , )
-		cell_explosion(target, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
+		cell_explosion(target_2, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		flame_radius(cause_data, 3, target_3, , , , , )
-		cell_explosion(target, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
+		cell_explosion(target_3, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		flame_radius(cause_data, 3, target_4, , , , , )
 		cell_explosion(target_4, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		sleep(1)

diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
@@ -126,7 +126,7 @@ Implant Specifics:<BR>"}
 
 /obj/item/implant/dexplosive/activate(cause)
 	if((!cause) || (!src.imp_in)) return 0
-	explosion(src, -1, 0, 2, 3, 0)//This might be a bit much, dono will have to see.
+	cell_explosion(src, 120, 40, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 	if(src.imp_in)
 		src.imp_in.gib()
 

diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
@@ -618,8 +618,6 @@
 	var/turf/T = get_turf(src.loc)
 	spawn(0)
 		broken() // break it first to give a warning
-		sleep(2)
-		explosion(T, 0, 0, 2, 2)
 		sleep(1)
 		qdel(src)