From 5c20a29b1d648af14fc5568bf16be5b7f575b0df Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 11 Mar 2017 18:25:23 +0100 Subject: [PATCH 1/2] Fix statue welding, fix firedoor message spam, fix slaughter candidate pick --- .../miniantags/slaughter/slaughter.dm | 13 +++++------ code/game/machinery/doors/firedoor.dm | 2 +- code/game/objects/structures/statues.dm | 22 ++++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 6988d2b16dd..6cc4db091af 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -104,9 +104,7 @@ speed = 0 boost = world.time + 60 - - - +// Cult slaughter demon /mob/living/simple_animal/slaughter/cult //Summoned as part of the cult objective "Bring the Slaughter" name = "harbringer of the slaughter" real_name = "harbringer of the Slaughter" @@ -154,17 +152,18 @@ /mob/living/simple_animal/slaughter/cult/New() ..() spawn(5) - var/list/demon_candidates = get_candidates(ROLE_CULTIST) + var/list/demon_candidates = pollCandidates("Do you want to play as a slaughter demon?", ROLE_DEMON, 1) if(!demon_candidates.len) visible_message("[src] disappears in a flash of red light!") qdel(src) return 0 - var/client/C = pick(demon_candidates) + var/mob/M = pick(demon_candidates) var/mob/living/simple_animal/slaughter/cult/S = src - if(!C) + if(!M || !M.client) visible_message("[src] disappears in a flash of red light!") qdel(src) return 0 + var/client/C = M.client S.key = C.key S.mind.assigned_role = "Harbringer of the Slaughter" @@ -181,7 +180,7 @@ ////////////////////The Powers -//Paradise Port:I added this cuase..SPOOPY DEMON IN YOUR BRAIN +//Paradise Port: I added this because..SPOOPY DEMON IN YOUR BRAIN /datum/action/innate/demon/whisper diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 194d5655eb1..a708e06fe93 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -110,6 +110,7 @@ return add_fingerprint(user) + user.changeNext_move(CLICK_CD_MELEE) if(can_force && (!glass || user.a_intent != I_HELP)) user.visible_message("[user] begins forcing \the [src].", \ @@ -119,7 +120,6 @@ "You force \the [src].") open() else if(glass) - user.changeNext_move(CLICK_CD_MELEE) user.visible_message("[user] bangs on \the [src].", "You bang on \the [src].") playsound(get_turf(src), 'sound/effects/Glassknock.ogg', 10, 1) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index e1c42feb07c..6e1ba7eb742 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -58,16 +58,18 @@ qdel(src) else if(iswelder(W) && !anchored) - playsound(loc, W.usesound, 40, 1) - user.visible_message("[user] is slicing apart the [name].", \ - "You are slicing apart the [name]...") - if(do_after(user, 40 * W.toolspeed, target = src)) - if(!loc) - return - playsound(loc, W.usesound, 50, 1) - user.visible_message("[user] slices apart the [name].", \ - "You slice apart the [name]!") - Dismantle(TRUE) + var/obj/item/weapon/weldingtool/WT = W + if(WT.remove_fuel(0, user)) + playsound(loc, W.usesound, 40, 1) + user.visible_message("[user] is slicing apart the [name].", \ + "You are slicing apart the [name]...") + if(do_after(user, 40 * W.toolspeed, target = src)) + if(!loc) + return + playsound(loc, W.usesound, 50, 1) + user.visible_message("[user] slices apart the [name].", \ + "You slice apart the [name]!") + Dismantle(TRUE) else hardness -= W.force/100 ..() From 255a6a1c179c7233680352c06fe1202bb5b1fb65 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 11 Mar 2017 18:26:04 +0100 Subject: [PATCH 2/2] Set poll time of cult demon to 100 --- code/game/gamemodes/miniantags/slaughter/slaughter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 6cc4db091af..62c3a9a00b0 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -152,7 +152,7 @@ /mob/living/simple_animal/slaughter/cult/New() ..() spawn(5) - var/list/demon_candidates = pollCandidates("Do you want to play as a slaughter demon?", ROLE_DEMON, 1) + var/list/demon_candidates = pollCandidates("Do you want to play as a slaughter demon?", ROLE_DEMON, 1, 100) if(!demon_candidates.len) visible_message("[src] disappears in a flash of red light!") qdel(src)