Merge branch 'master' of https://github.com/ss220club/Paradise

code/modules/client/preference/loadout/loadout_shoes.dm

@@ -62,3 +62,11 @@
 /datum/gear/shoes/whiteshoes
 	display_name = "White shoes"
 	path = /obj/item/clothing/shoes/white
+
+/datum/gear/shoes/shark
+	display_name = "shark slippers"
+	path = /obj/item/clothing/shoes/shark
+
+/datum/gear/shoes/shark_light
+	display_name = "shark lightblue slippers"
+	path = /obj/item/clothing/shoes/shark/light

code/modules/client/preference/loadout/loadout_suit.dm

@@ -261,6 +261,14 @@
 	display_name = "hoodie, black"
 	path = /obj/item/clothing/suit/hooded/hoodie
 
+/datum/gear/suit/shark
+	display_name = "shark costume"
+	path = /obj/item/clothing/suit/hooded/shark_costume
+
+/datum/gear/suit/shark_light
+	display_name = "shark lightblue costume"
+	path = /obj/item/clothing/suit/hooded/shark_costume/light
+
 //SUITS!
 
 /datum/gear/suit/blacksuit

code/modules/clothing/shoes/miscellaneous.dm

@@ -497,6 +497,20 @@
 	icon_state = "ducky"
 	item_state = "ducky"
 
+/obj/item/clothing/shoes/shark
+	name = "shark slippers"
+	desc = "These shoes are made from shark skin, or is it?"
+	icon_state = "shark"
+	item_state = "shark"
+	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+
+/obj/item/clothing/shoes/shark/light
+	name = "lightblue shark slippers"
+	icon_state = "shark_light"
+	item_state = "shark_light"
+
+
 /obj/item/clothing/shoes/ducky/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/squeak, list('sound/items/squeaktoy.ogg' = 1), 50, falloff_exponent = 20) //die off quick please

code/modules/clothing/suits/miscellaneous.dm

@@ -335,6 +335,37 @@
 	flags = BLOCKHAIR
 	flags_inv = HIDEHEADSETS
 
+/obj/item/clothing/suit/hooded/shark_costume
+	name = "shark costume"
+	desc = "A costume made from 'synthetic' shark skin, it smells."
+	icon_state = "shark_casual"
+	lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	allowed = list(/obj/item/tank/internals/emergency_oxygen)
+	hoodtype = /obj/item/clothing/head/hooded/shark_hood
+
+/obj/item/clothing/head/hooded/shark_hood
+	name = "shark hood"
+	desc = "A hood attached to a shark costume."
+	icon_state = "shark_casual"
+	body_parts_covered = HEAD
+	cold_protection = HEAD
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	flags = BLOCKHAIR
+	flags_inv = HIDEHEADSETS
+
+/obj/item/clothing/suit/hooded/shark_costume/light
+	name = "lightblue shark costume"
+	icon_state = "shark_casual_light"
+	hoodtype = /obj/item/clothing/head/hooded/shark_hood/light
+
+/obj/item/clothing/head/hooded/shark_hood/light
+	name = "lightblue shark hood"
+	icon_state = "shark_casual_light"
+
 /obj/item/clothing/suit/hooded/salmon_costume
 	name = "salmon suit"
 	desc = "A costume made from authentic salmon scales, it reeks!"