From 460c112165feef77f05232b6a026ee9a482e7009 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Fri, 27 Sep 2019 14:53:58 +1000
Subject: [PATCH] Fixes slime miss chance

---
 .../living/simple_mob/subtypes/slime/feral/feral_vr.dm |  2 ++
 .../mob/living/simple_mob/subtypes/slime/slime.dm      | 10 +++++++++-
 .../mob/living/simple_mob/subtypes/slime/slime_vr.dm   |  5 ++++-
 vorestation.dme                                        |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 code/modules/mob/living/simple_mob/subtypes/slime/feral/feral_vr.dm

diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral_vr.dm b/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral_vr.dm
new file mode 100644
index 0000000000..5d29866ee3
--- /dev/null
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/feral/feral_vr.dm
@@ -0,0 +1,2 @@
+/mob/living/simple_mob/slime/feral/dark_blue
+	base_attack_cooldown = 3 SECONDS
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
index 083823d883..7590fb2e05 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
@@ -164,8 +164,16 @@
 		give_hat(I, user)
 		return
 
+	//VOREStation Edit Start
+	var/can_miss = TRUE
+	for(var/item_type in allowed_attack_types)
+		if(istype(I, item_type))
+			can_miss = FALSE
+			break
+	//VOREStation Edit End
+
 	// Otherwise they're probably fighting the slime.
-	if(prob(25))
+	if(prob(25) && can_miss)	//VOREStation Edit
 		visible_message(span("warning", "\The [user]'s [I] passes right through \the [src]!"))
 		user.setClickCooldown(user.get_attack_speed(I))
 		return
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm
index e666bdf139..10ba0ed1ca 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime_vr.dm
@@ -1,2 +1,5 @@
 /mob/living/simple_mob/slime
-	base_attack_cooldown = 2 SECONDS
\ No newline at end of file
+	base_attack_cooldown = 2 SECONDS
+	var/allowed_attack_types = list(
+							/obj/item/weapon/melee/baton/slime,
+							/obj/item/slimepotion)
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 54352f8ca8..37b332f6ff 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2499,6 +2499,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\slime\slime.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\slime_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\feral\feral.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\slime\feral\feral_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\combat.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\consumption.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\defense.dm"