diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 703d86464cd..58f010aede5 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -1217,6 +1217,7 @@ else for (var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z)) S.add(stack,user) + ..() /obj/item/stack/sheet/wood name = "wooden planks" diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index aa4d53e9bc5..68c2bf86817 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -116,6 +116,11 @@ changeling.current << "\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them." changeling.current << "You must complete the following tasks:" + if (changeling.current.mind) + if (changeling.current.mind.assigned_role == "Clown") + changeling.current << "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself." + changeling.current.mutations.Remove(CLUMSY) + var/obj_count = 1 for(var/datum/objective/objective in changeling.objectives) changeling.current << "Objective #[obj_count]: [objective.explanation_text]" diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index fd57bd401b1..76a3976a15f 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -126,6 +126,13 @@ /datum/game_mode/proc/equip_cultist(mob/living/carbon/human/mob) if(!istype(mob)) return + + if (mob.mind) + if (mob.mind.assigned_role == "Clown") + mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + mob.mutations.Remove(CLUMSY) + + var/obj/item/weapon/paper/talisman/supply/T = new(mob) var/list/slots = list ( "backpack" = mob.slot_in_backpack, diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 01271fb11fb..cef4ca676e3 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -127,6 +127,13 @@ /datum/game_mode/proc/equip_revolutionary(mob/living/carbon/human/mob) if(!istype(mob)) return + + if (mob.mind) + if (mob.mind.assigned_role == "Clown") + mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + mob.mutations.Remove(CLUMSY) + + var/obj/item/device/flash/T = new(mob) var/list/slots = list (