From 77f897e91c3451f138cebf209e22cfdc78e79214 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 17 May 2018 11:57:33 -0400 Subject: [PATCH] Fixes soulstone runtime --- code/modules/antagonists/wizard/equipment/soulstone.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 11882f65d1..11b0c3f29c 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -222,7 +222,11 @@ if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode) SSticker.mode.add_cultist(newstruct.mind, 0) if(iscultist(stoner) || cultoverride) +<<<<<<< HEAD to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow their orders and help them complete their goals at all costs.") +======= + to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow [stoner ? stoner.p_their() : "their"] orders and help [stoner ? stoner.p_them() : "them"] complete [stoner ? stoner.p_their() : "their"] goals at all costs.") +>>>>>>> 8faa41a... Fixes soulstone runtime (#37883) else if(stoner) to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow their orders and help them complete their goals at all costs.") newstruct.clear_alert("bloodsense")