From e6991a0bd2a458a7907f83129d853dc30610de1f Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sat, 12 Jan 2019 17:06:14 +0000 Subject: [PATCH] Gives admins a button to remove metal + cult dagger from Cultists :cl: coiax admin: Admins have a button to remove the runed metal and cult dagger from cultists. /:cl: Could have used this in a previous round. --- code/modules/antagonists/cult/cult.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 2ea8ff94df8..aac52cdcad7 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -158,15 +158,22 @@ . = ..() .["Dagger"] = CALLBACK(src,.proc/admin_give_dagger) .["Dagger and Metal"] = CALLBACK(src,.proc/admin_give_metal) + .["Remove Dagger and Metal"] = CALLBACK(src, .proc/admin_take_all) /datum/antagonist/cult/proc/admin_give_dagger(mob/admin) - if(!equip_cultist(FALSE)) + if(!equip_cultist(metal=FALSE)) to_chat(admin, "Spawning dagger failed!") /datum/antagonist/cult/proc/admin_give_metal(mob/admin) - if (!equip_cultist(TRUE)) + if (!equip_cultist(metal=TRUE)) to_chat(admin, "Spawning runed metal failed!") +/datum/antagonist/cult/proc/admin_take_all(mob/admin) + var/mob/living/current = owner.current + for(var/o in current.GetAllContents()) + if(istype(o, /obj/item/melee/cultblade/dagger) || istype(o, /obj/item/stack/sheet/runed_metal)) + qdel(o) + /datum/antagonist/cult/master ignore_implant = TRUE show_in_antagpanel = FALSE //Feel free to add this later