ehhh changing some stuff

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

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
@@ -638,13 +638,13 @@
 		sleep(50) //AWW YEAH
 		var/datum/cause_data/cause_data = create_cause_data("artillery fire", user)
 		flame_radius(cause_data, 3, target, , , , , )
-		explosion(target,  -1, 2, 3, 5, , , , cause_data)
+		cell_explosion(target, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		flame_radius(cause_data, 3, target_2, , , , , )
-		explosion(target_2,  -1, 2, 3, 5, , , , cause_data)
+		cell_explosion(target, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		flame_radius(cause_data, 3, target_3, , , , , )
-		explosion(target_3,  -1, 2, 3, 5, , , , cause_data)
+		cell_explosion(target, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		flame_radius(cause_data, 3, target_4, , , , , )
-		explosion(target_4,  -1, 2, 3, 5, , , , cause_data)
+		cell_explosion(target_4, 220, 45, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 		sleep(1)
 		qdel(lasertarget)
 		lasing = FALSE

diff --git a/code/modules/cm_marines/equipment/mortar/mortar_shells.dm b/code/modules/cm_marines/equipment/mortar/mortar_shells.dm
@@ -30,18 +30,18 @@
 	desc = "An 80mm mortar shell, loaded with a high explosive charge."
 	icon_state = "mortar_ammo_he"
 
-/obj/item/mortar_shell/he/detonate(turf/T)
-	explosion(T, 0, 3, 5, 7, explosion_cause_data = cause_data)
+/obj/item/mortar_shell/he/detonate(turf/epicenter)
+	cell_explosion(epicenter, 240, 34, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 
 /obj/item/mortar_shell/frag
 	name = "\improper 80mm fragmentation mortar shell"
 	desc = "An 80mm mortar shell, loaded with a fragmentation charge."
 	icon_state = "mortar_ammo_frag"
 
-/obj/item/mortar_shell/frag/detonate(turf/T)
-	create_shrapnel(T, 60, cause_data = cause_data)
+/obj/item/mortar_shell/frag/detonate(turf/epicenter)
+	create_shrapnel(epicenter, 60, cause_data = cause_data)
 	sleep(2)
-	cell_explosion(T, 60, 20, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
+	cell_explosion(epicenter, 60, 20, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
 
 /obj/item/mortar_shell/incendiary
 	name = "\improper 80mm incendiary mortar shell"
@@ -53,10 +53,10 @@
 	var/flameshape = FLAMESHAPE_DEFAULT
 	var/fire_type = FIRE_VARIANT_TYPE_B //Armor Shredding Greenfire
 
-/obj/item/mortar_shell/incendiary/detonate(turf/T)
-	explosion(T, 0, 2, 4, 7, explosion_cause_data = cause_data)
-	flame_radius(cause_data, radius, T, flame_level, burn_level, flameshape, null, fire_type)
-	playsound(T, 'sound/weapons/gun_flamethrower2.ogg', 35, 1, 4)
+/obj/item/mortar_shell/incendiary/detonate(turf/epicenter)
+	cell_explosion(epicenter, 200, 33, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, cause_data)
+	flame_radius(cause_data, radius, epicenter, flame_level, burn_level, flameshape, null, fire_type)
+	playsound(epicenter, 'sound/weapons/gun_flamethrower2.ogg', 35, 1, 4)
 
 /obj/item/mortar_shell/flare
 	name = "\improper 80mm flare/camera mortar shell"