From 79b5e412f1d1e4d2ba5ba14b61d7a68792602f34 Mon Sep 17 00:00:00 2001
From: Dax Dupont <skyemenjou@gmail.com>
Date: Mon, 14 May 2018 18:41:24 +0200
Subject: [PATCH] Makes cult items less of a vomit coaster

---
 code/modules/antagonists/cult/cult_items.dm            | 8 ++++++++
 code/modules/antagonists/wizard/equipment/soulstone.dm | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 35399dc8e0..c7c066c62f 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -71,8 +71,11 @@
 	if(!iscultist(user))
 		if(!is_servant_of_ratvar(user))
 			to_chat(user, "<span class='cultlarge'>\"I wouldn't advise that.\"</span>")
+<<<<<<< HEAD
 			to_chat(user, "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>")
 			user.Dizzy(120)
+=======
+>>>>>>> 9f94b67... as kor suggested
 		else
 			to_chat(user, "<span class='cultlarge'>\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"</span>")
 			to_chat(user, "<span class='userdanger'>A horrible force yanks at your arm!</span>")
@@ -136,10 +139,14 @@
 	if(!iscultist(user))
 		if(!is_servant_of_ratvar(user))
 			to_chat(user, "<span class='cultlarge'>\"I wouldn't advise that.\"</span>")
+<<<<<<< HEAD
 			to_chat(user, "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>")
 			user.Dizzy(80)
 			user.dropItemToGround(src, TRUE)
 			user.Knockdown(30)
+=======
+			force = 5
+>>>>>>> 9f94b67... as kor suggested
 			return
 		else
 			to_chat(user, "<span class='cultlarge'>\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"</span>")
@@ -149,6 +156,7 @@
 			user.dropItemToGround(src, TRUE)
 			user.Knockdown(50)
 			return
+	force = initial(force)
 	jaunt.Grant(user, src)
 	linked_action.Grant(user, src)
 	user.update_icons()
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index c0a328b3ae..66e9123c4e 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -33,7 +33,10 @@
 	..()
 	if(!iscultist(user) && !iswizard(user) && !usability)
 		to_chat(user, "<span class='danger'>An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.</span>")
+<<<<<<< HEAD
 		user.Dizzy(120)
+=======
+>>>>>>> 9f94b67... as kor suggested
 
 /obj/item/soulstone/examine(mob/user)
 	..()