From 79b5e412f1d1e4d2ba5ba14b61d7a68792602f34 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Mon, 14 May 2018 18:41:24 +0200 Subject: [PATCH 1/3] 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, "\"I wouldn't advise that.\"") +<<<<<<< HEAD to_chat(user, "An overwhelming sense of nausea overpowers you!") user.Dizzy(120) +======= +>>>>>>> 9f94b67... as kor suggested else to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") to_chat(user, "A horrible force yanks at your arm!") @@ -136,10 +139,14 @@ if(!iscultist(user)) if(!is_servant_of_ratvar(user)) to_chat(user, "\"I wouldn't advise that.\"") +<<<<<<< HEAD to_chat(user, "An overwhelming sense of nausea overpowers you!") user.Dizzy(80) user.dropItemToGround(src, TRUE) user.Knockdown(30) +======= + force = 5 +>>>>>>> 9f94b67... as kor suggested return else to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") @@ -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, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.") +<<<<<<< HEAD user.Dizzy(120) +======= +>>>>>>> 9f94b67... as kor suggested /obj/item/soulstone/examine(mob/user) ..() From fe93e1ccbdaec6440bff937d7dd38fe9f81be775 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 16 May 2018 09:04:39 -0500 Subject: [PATCH 2/3] Update cult_items.dm --- code/modules/antagonists/cult/cult_items.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index c7c066c62f..4de5219d7d 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -71,11 +71,6 @@ if(!iscultist(user)) if(!is_servant_of_ratvar(user)) to_chat(user, "\"I wouldn't advise that.\"") -<<<<<<< HEAD - to_chat(user, "An overwhelming sense of nausea overpowers you!") - user.Dizzy(120) -======= ->>>>>>> 9f94b67... as kor suggested else to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") to_chat(user, "A horrible force yanks at your arm!") @@ -139,14 +134,7 @@ if(!iscultist(user)) if(!is_servant_of_ratvar(user)) to_chat(user, "\"I wouldn't advise that.\"") -<<<<<<< HEAD - to_chat(user, "An overwhelming sense of nausea overpowers you!") - user.Dizzy(80) - user.dropItemToGround(src, TRUE) - user.Knockdown(30) -======= force = 5 ->>>>>>> 9f94b67... as kor suggested return else to_chat(user, "\"One of Ratvar's toys is trying to play with things [user.p_they()] shouldn't. Cute.\"") From 3103119f6b8fe7a9d0633276037a01ba3b5ba712 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 16 May 2018 09:04:51 -0500 Subject: [PATCH 3/3] Update soulstone.dm --- code/modules/antagonists/wizard/equipment/soulstone.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 66e9123c4e..11882f65d1 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -33,10 +33,6 @@ ..() if(!iscultist(user) && !iswizard(user) && !usability) to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.") -<<<<<<< HEAD - user.Dizzy(120) -======= ->>>>>>> 9f94b67... as kor suggested /obj/item/soulstone/examine(mob/user) ..()