From 1105becd29c5436a7bf72c8858f2fe438010d6d1 Mon Sep 17 00:00:00 2001
From: nemvar <47324920+nemvar@users.noreply.github.com>
Date: Thu, 30 May 2019 10:56:07 +0200
Subject: [PATCH] Fixes charged oil explosion. Reworks burning oil (#44093)

About The Pull Request

Makes the charged oil explosion look less stupid. Also slightly nerfs it.

Also reworks how burning oil works. It now call ex_act on nearby mobs when it explodes, damaging mobs but leaving the enviroment unharmed.
---
 .../modules/research/xenobiology/crossbreeding/burning.dm | 8 ++++++--
 .../modules/research/xenobiology/crossbreeding/charged.dm | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm
index 4bd802b3d9f..f5f51a364af 100644
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ b/code/modules/research/xenobiology/crossbreeding/burning.dm
@@ -259,11 +259,15 @@ Burning extracts:
 	effect_desc = "Creates an explosion after a few seconds."
 
 /obj/item/slimecross/burning/oil/do_effect(mob/user)
-	user.visible_message("<span class='danger'>[src] begins to shake with rapidly increasing force!</span>")
+	user.visible_message("<span class='warning'>[user] activates [src]. It's going to explode!</span>", "<span class='danger'>You activate [src]. It crackles in anticipation</span>")
 	addtimer(CALLBACK(src, .proc/boom), 50)
 
 /obj/item/slimecross/burning/oil/proc/boom()
-	explosion(get_turf(src), 2, 4, 4) //Same area as normal oils, but increased high-impact values by one each, then decreased light by 2.
+	var/turf/T = get_turf(src)
+	playsound(T, 'sound/effects/explosion2.ogg', 200, 1)
+	for(var/mob/living/M in range(2, T))
+		new /obj/effect/temp_visual/explosion(get_turf(M))
+		M.ex_act(EXPLODE_HEAVY)
 	qdel(src)
 
 /obj/item/slimecross/burning/black
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index a2030bebac0..d39e9585227 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -223,7 +223,7 @@ Charged extracts:
 	addtimer(CALLBACK(src, .proc/boom), 50)
 
 /obj/item/slimecross/charged/oil/proc/boom()
-	explosion(get_turf(src), 3, 2, 1) //Much smaller effect than normal oils, but devastatingly strong where it does hit.
+	explosion(get_turf(src), 2, 3, 4) //Much smaller effect than normal oils, but devastatingly strong where it does hit.
 	qdel(src)
 
 /obj/item/slimecross/charged/black