From 03d9fbee7addff3199fba01205f040aed0a7f0ba Mon Sep 17 00:00:00 2001
From: "johnsonmt88@gmail.com"
 <johnsonmt88@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Wed, 20 Jun 2012 18:26:32 +0000
Subject: [PATCH] Clowns now lose their "clumsy" status when chosen to be a
 changeling, cultist or head revolutionary. Fixes issue 582

Fix for stacks not stacking anymore.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3879 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/obj.dm                          | 1 +
 code/game/gamemodes/changeling/changeling.dm | 5 +++++
 code/game/gamemodes/cult/cult.dm             | 7 +++++++
 code/game/gamemodes/revolution/revolution.dm | 7 +++++++
 4 files changed, 20 insertions(+)

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 << "<b>\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.</b>"
 	changeling.current << "<B>You must complete the following tasks:</B>"
 
+	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 << "<B>Objective #[obj_count]</B>: [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 (