Sonic Costume Pack (#37660)

* Sonic Costume Pack + Itty bitty bugfix

Adds in 6 new costumes to the AutoDrobe. Also fixes an issue where you couldn't use the wirecutters as a ghetto hemostat and I did the screwdriver too because why not.

* Update organs_internal.dm

* tweak

small text  tweaks because the knuckles and sonicman suit weren't showing properly.

* fixes conflicting files

code/game/objects/items/weapons/storage/boxes.dm

@@ -1361,3 +1361,53 @@
 	new /obj/item/clothing/shoes/hunter(src)
 	new /obj/item/clothing/head/hunter(src)
 	new /obj/item/clothing/gloves/hunter(src)
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/shadowsuit
+	name = "Shadow costume box"
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/shadowsuit/New()
+	new /obj/item/clothing/suit/shadowsuit(src)
+	new	/obj/item/clothing/head/shadowhead(src)
+	..()
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/sonicsuit
+	name = "Sonic costume box"
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/sonicsuit/New()
+	new /obj/item/clothing/suit/sonicsuit(src)
+	new	/obj/item/clothing/head/sonichead(src)
+	..()
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/tailssuit
+	name = "Tails costume box"
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/tailssuit/New()
+	new /obj/item/clothing/suit/tailssuit(src)
+	new	/obj/item/clothing/head/tailshead(src)
+	..()
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/knucklessuit
+	name = "Knuckles costume box"
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/knucklessuit/New()
+	new /obj/item/clothing/suit/knucklessuit(src)
+	new	/obj/item/clothing/head/knuckleshead(src)
+	..()
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/amysuit
+	name = "Amy costume box"
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/amysuit/New()
+	new /obj/item/clothing/suit/amysuit(src)
+	new	/obj/item/clothing/head/amyhead(src)
+	..()
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/sonicman
+	name = "Sonicman costume box"
+
+/obj/item/weapon/storage/box/smartbox/clothing_box/sonicman/New()
+	new /obj/item/clothing/under/sonicman(src)
+	new	/obj/item/clothing/head/helmet/sonicman(src)
+	new	/obj/item/clothing/gloves/sonicman(src)
+	new	/obj/item/clothing/shoes/sonicman(src)
+	..()

code/modules/clothing/gloves/miscellaneous.dm

@@ -477,3 +477,10 @@
 
 /obj/item/clothing/gloves/hunter/rangeTackleBonus()
 	return 1
+
+/obj/item/clothing/gloves/sonicman
+	name = "sonicman gloves"
+	desc = "A pair of gloves, hand-stitched with a custom logo."
+	icon_state = "sonicmangloves"
+	item_state = "sonicmangloves"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/gloves.dmi', "right_hand" = 'icons/mob/in-hand/right/gloves.dmi')

code/modules/clothing/head/helmet.dm

@@ -381,3 +381,13 @@
 					item_state = "xcombalaclava_f3"
 
 		H.update_inv_head()
+
+/obj/item/clothing/head/helmet/sonicman
+	name = "sonicman helmet"
+	desc = "A helmet made with speed on the mind."
+	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+	icon_state = "sonicmanhead"
+	item_state = "sonicmanhead"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/items_lefthand.dmi', "right_hand" = 'icons/mob/in-hand/right/items_righthand.dmi')
+	species_fit = list(VOX_SHAPED, INSECT_SHAPED)
+	body_parts_covered = HEAD|EARS|MASKHEADHAIR

code/modules/clothing/head/misc.dm

@@ -846,6 +846,46 @@ var/image/unusual_overlay = image('icons/mob/head.dmi', "unusual_overlay", pixel
 /obj/item/clothing/head/hunter/rangeTackleBonus()
 	return 1
 
+/obj/item/clothing/head/shadowhead
+	name = "shadow costume head"
+	desc = "Amnesia not included."
+	icon_state = "shadowhead"
+	item_state = "shadowhead"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = HIDEHAIR
+
+/obj/item/clothing/head/sonichead
+	name = "sonic costume head"
+	desc = "Formerly a pre-order bonus."
+	icon_state = "sonichead"
+	item_state = "sonichead"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = HIDEHAIR
+
+/obj/item/clothing/head/tailshead
+	name = "tails costume head"
+	desc = "Smells like mint."
+	icon_state = "tailshead"
+	item_state = "tailshead"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = HIDEHAIR
+
+/obj/item/clothing/head/knuckleshead
+	name = "knuckles costume head"
+	desc = "What a knucklehead."
+	icon_state = "knuckleshead"
+	item_state = "knuckleshead"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = HIDEHAIR
+
+/obj/item/clothing/head/amyhead
+	name = "amy costume head"
+	desc = "Pretty pink I think."
+	icon_state = "amyhead"
+	item_state = "amyhead"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = HIDEHAIR
+
 /obj/item/clothing/head/coonskin_cap
 	name = "coonskin cap"
 	desc = "You may all well go to hell, and I will go to Space Texas."

code/modules/clothing/shoes/miscellaneous.dm

@@ -634,3 +634,9 @@
 
 /obj/item/clothing/shoes/hunter/rangeTackleBonus()
 	return 1
+
+/obj/item/clothing/shoes/sonicman
+	name = "sonicman shoes"
+	icon_state = "sonicmanshoes"
+	item_state = "sonicmanshoes"
+	desc = "Lightspeed dash sold seperately."

code/modules/clothing/suits/miscellaneous.dm

@@ -1207,3 +1207,48 @@ var/list/tag_suits_list = list()
 	item_state = "wftr"
 	species_fit = list(INSECT_SHAPED, VOX_SHAPED, GREY_SHAPED)
 	body_parts_covered = FULL_TORSO
+
+/obj/item/clothing/suit/shadowsuit
+	name = "shadow suit"
+	desc = "A costume good enough to belong to a faker."
+	icon_state = "shadowsuit"
+	item_state = "shadowsuit"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = FULL_TORSO|LEGS|FEET|ARMS|HANDS|HIDETAIL
+	clothing_flags = ONESIZEFITSALL
+
+/obj/item/clothing/suit/sonicsuit
+	name = "sonic suit"
+	desc = "A costume based on a true blue."
+	icon_state = "sonicsuit"
+	item_state = "sonicsuit"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = FULL_TORSO|LEGS|FEET|ARMS|HANDS|HIDETAIL
+	clothing_flags = ONESIZEFITSALL
+
+/obj/item/clothing/suit/tailssuit
+	name = "tails suit"
+	desc = "A costume based on a bonafide sidekick."
+	icon_state = "tailssuit"
+	item_state = "tailssuit"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = FULL_TORSO|LEGS|FEET|ARMS|HANDS|HIDETAIL
+	clothing_flags = ONESIZEFITSALL
+
+/obj/item/clothing/suit/knucklessuit
+	name = "knuckles suit"
+	desc = "A costume designed for protecting oversized jewels."
+	icon_state = "knucklessuit"
+	item_state = "knucklessuit"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = FULL_TORSO|LEGS|FEET|ARMS|HANDS|HIDETAIL
+	clothing_flags = ONESIZEFITSALL
+
+/obj/item/clothing/suit/amysuit
+	name = "amy suit"
+	desc = "Piko-piko hammer not included."
+	icon_state = "amysuit"
+	item_state = "amysuit"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/clothing.dmi', "right_hand" = 'icons/mob/in-hand/right/clothing.dmi')
+	body_parts_covered = FULL_TORSO|LEGS|FEET|ARMS|HANDS|HIDETAIL
+	clothing_flags = ONESIZEFITSALL

code/modules/clothing/under/miscellaneous.dm

@@ -1111,3 +1111,12 @@
 	dyeable_parts = list("drape","trim")
 	clothing_flags = COLORS_OVERLAY
 	color = COLOR_LINEN
+
+/obj/item/clothing/under/sonicman
+	name = "sonicman suit"
+	desc = "Did you call me?"
+	icon_state = "sonicmansuit"
+	item_state = "sonicmansuit"
+	_color = "sonicmansuit"
+	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/items_lefthand.dmi', "right_hand" = 'icons/mob/in-hand/right/items_righthand.dmi')
+	clothing_flags = ONESIZEFITSALL

vgstation13.dme

@@ -3005,8 +3005,8 @@
 #include "maprendering\maprendering.dm"
 #include "maps\_map.dm"
 #include "maps\_map_override.dm"
-#include "maps\defficiency\areas.dm"
 #include "maps\tgstation.dm"
+#include "maps\defficiency\areas.dm"
 #include "maps\derelicts\derelicts.dm"
 #include "maps\fixedvaults\fixedvaults.dm"
 #include "maps\lampreystation\lamprey.dm"