From 9772ac1817bc8fba1aeffe137c74160b7868ebb6 Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 2 Oct 2017 14:58:37 -0400 Subject: [PATCH 1/2] Bastard Sword Soul Fix --- code/game/gamemodes/cult/cult_items.dm | 10 ++++++---- code/game/gamemodes/wizard/soulstone.dm | 1 - code/game/objects/items/storage/book.dm | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 876cace14df..58fca20df3a 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -98,7 +98,6 @@ var/datum/action/innate/cult/spin2win/linked_action var/spinning = FALSE var/spin_cooldown = 250 - var/list/shards = list() var/dash_toggled = TRUE /obj/item/twohanded/required/cult_bastard/Initialize() @@ -174,11 +173,14 @@ if(H.stat != CONSCIOUS) var/obj/item/device/soulstone/SS = new /obj/item/device/soulstone(src) SS.attack(H, user) - shards += SS - return + if(!LAZYLEN(SS.contents)) + qdel(SS) if(istype(target, /obj/structure/constructshell) && contents.len) var/obj/item/device/soulstone/SS = contents[1] - if(istype(SS) && SS.transfer_soul("CONSTRUCT",target,user)) + if(istype(SS)) + SS.transfer_soul("CONSTRUCT",target,user) + + qdel(SS) /datum/action/innate/dash/cult diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 149c2ae9126..aa630548b0a 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -60,7 +60,6 @@ to_chat(user, "\"Come now, do not capture your bretheren's soul.\"") return add_logs(user, M, "captured [M.name]'s soul", src) - transfer_soul("VICTIM", M, user) ///////////////////Options for using captured souls/////////////////////////////////////// diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 28856e17d83..c0c861f4c4e 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -162,7 +162,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1) if(do_after(user, 40, target = sword)) playsound(src,'sound/effects/pray_chaplain.ogg',60,1) - for(var/obj/item/device/soulstone/SS in sword.shards) + for(var/obj/item/device/soulstone/SS in sword.contents) SS.usability = TRUE for(var/mob/living/simple_animal/shade/EX in SS) SSticker.mode.remove_cultist(EX.mind, 1, 0) From 92193ed933ec766078fe40e5f15accf447d230c7 Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 2 Oct 2017 15:11:08 -0400 Subject: [PATCH 2/2] Removed random newlines --- code/game/gamemodes/cult/cult_items.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 58fca20df3a..2780598d06f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -179,8 +179,6 @@ var/obj/item/device/soulstone/SS = contents[1] if(istype(SS)) SS.transfer_soul("CONSTRUCT",target,user) - - qdel(SS) /datum/action/innate/dash/cult