From 31fc0d39a5f7bd113db7bba8fe9d0af9565e31a4 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Wed, 6 May 2015 23:26:33 -0400
Subject: [PATCH] Final touches on superheroes

---
 .../objects/items/weapons/storage/toolbox.dm    |  3 +++
 code/modules/clothing/shoes/colour.dm           |  3 +++
 code/modules/clothing/under/color.dm            |  3 +++
 code/modules/mob/living/carbon/superheroes.dm   | 17 ++++++++++++-----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index d905730dbf8..a50dd50f6fb 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -49,6 +49,9 @@
 		new /obj/item/device/analyzer(src)
 		new /obj/item/weapon/wirecutters(src)
 
+/obj/item/weapon/storage/toolbox/mechanical/greytide
+	flags = NODROP
+
 /obj/item/weapon/storage/toolbox/electrical
 	name = "electrical toolbox"
 	icon_state = "yellow"
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index ef92c5837df..119971e5be0 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -13,6 +13,9 @@
 	redcoat
 		_color = "redcoat"	//Exists for washing machines. Is not different from black shoes in any way.
 
+/obj/item/clothing/shoes/black/greytide
+	flags = NODROP
+
 /obj/item/clothing/shoes/brown
 	name = "brown shoes"
 	desc = "A pair of brown shoes."
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index b5f276c2539..54fbe20c87b 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -50,6 +50,9 @@
 	flags = ONESIZEFITSALL
 	species_fit = list("Vox")
 
+/obj/item/clothing/under/color/grey/greytide
+	flags = ONESIZEFITSALL | NODROP
+
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
 	desc = "Don't wear this near paranoid security officers"
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index 95348d66af4..e25dc9911e9 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -6,7 +6,7 @@
 /datum/superheroes
 	var/name
 	var/class
-	var/list/default_genes = list()
+	var/list/default_genes = list(REGEN, NO_BREATH, RESIST_COLD)
 	var/list/default_spells = list()
 
 /datum/superheroes/proc/create(var/mob/living/carbon/human/H)
@@ -53,7 +53,6 @@
 
 /datum/superheroes/owlman
 	name = "Owlman"
-	default_genes = list(REGEN, NO_BREATH)
 	class = "Superhero"
 
 /datum/superheroes/owlman/equip(var/mob/living/carbon/human/H)
@@ -69,7 +68,6 @@
 
 /datum/superheroes/griffin
 	name = "The Griffin"
-	default_genes = list(REGEN, NO_BREATH)
 	default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/recruit)
 	class = "Supervillain"
 
@@ -84,7 +82,6 @@
 
 /datum/superheroes/lightnian
 	name = "LightnIan"
-	default_genes = list(REGEN, NO_BREATH)
 	default_spells = list(/obj/effect/proc_holder/spell/wizard/targeted/lightning/lightnian)
 	class = "Superhero"
 
@@ -96,6 +93,7 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/suit/corgisuit(H), slot_wear_suit)
 	H.equip_to_slot_or_del(new /obj/item/clothing/head/corgi(H), slot_head)
 	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/yellow(H), slot_gloves)
+	H.equip_to_slot_or_del(new /obj/item/weapon/bedsheet/orange(H), slot_back)
 
 
 
@@ -177,5 +175,14 @@
 		target << "<span class='deadsay'><b>You have decided to enroll as a henchman for [usr]. You are now part of the feared 'Greyshirts'.</b></span>"
 		target << "<span class='deadsay'><b>You must follow the orders of [usr], and help him succeed in his dastardly schemes.</span>"
 		target << "<span class='deadsay'>You may not harm other Greyshirt or [usr]. However, you do not need to obey other Greyshirts.</span>"
-		target.adjustOxyLoss(-200) //In case the shadowling was choking them out
 		ticker.mode.greyshirts += target.mind
+		target.set_species("Human")
+		target.h_style = "Bald"
+		target.fully_replace_character_name(target.real_name, "Generic Henchman ([rand(1, 1000)])")
+		for(var/obj/item/W in target)
+			if(istype(W,/obj/item/organ)) continue
+			target.unEquip(W)
+		target.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey/greytide(target), slot_w_uniform)
+		target.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(target), slot_shoes)
+		target.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical/greytide(target), slot_l_hand)
+		target.regenerate_icons()
\ No newline at end of file