Merge pull request #1071 from DimWhat/playbunny

Adds a bunny suit costume and a bunch of other versions

code/datums/greyscale/config_types/greyscale_configs.dm

@@ -1177,6 +1177,28 @@
 *	SUITS
 */
 
+// JACKETS
+
+/datum/greyscale_config/tailcoat
+	name = "Tailcoat"
+	icon_file = 'monkestation/icons/obj/clothing/suits.dmi'
+	json_config = 'code/datums/greyscale/json_configs/tailcoat.json'
+
+/datum/greyscale_config/tailcoat_worn
+	name = "Worn Tailcoat"
+	icon_file = 'monkestation/icons/mob/clothing/suit.dmi'
+	json_config = 'code/datums/greyscale/json_configs/tailcoat_worn.json'
+
+/datum/greyscale_config/tailcoat_bar
+	name = "Tailcoat"
+	icon_file = 'monkestation/icons/obj/clothing/suits.dmi'
+	json_config = 'code/datums/greyscale/json_configs/tailcoat_bar.json'
+
+/datum/greyscale_config/tailcoat_bar_worn
+	name = "Worn Tailcoat"
+	icon_file = 'monkestation/icons/mob/clothing/suit.dmi'
+	json_config = 'code/datums/greyscale/json_configs/tailcoat_bar_worn.json'
+
 // JUMPSUITS
 
 /datum/greyscale_config/jumpsuit_worn/digitigrade
@@ -1200,3 +1222,43 @@
 /datum/greyscale_config/sneakers_orange_worn/digitigrade
 	name = "Worn Orange Sneakers - Digitigrade"
 	icon_file = DIGITIGRADE_SHOES_FILE
+
+/datum/greyscale_config/bowtie_collar
+	name = "Bowtie Collar"
+	icon_file = 'monkestation/icons/obj/clothing/necks.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bowtie_collar.json'
+
+/datum/greyscale_config/bowtie_collar_worn
+	name = "Worn Bowtie Collar"
+	icon_file = 'monkestation/icons/mob/clothing/neck.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bowtie_collar_worn.json'
+
+/datum/greyscale_config/heels
+	name = "Heels"
+	icon_file = 'monkestation/icons/obj/clothing/shoes.dmi'
+	json_config = 'code/datums/greyscale/json_configs/heels.json'
+
+/datum/greyscale_config/heels_worn
+	name = "Worn Heels"
+	icon_file = 'monkestation/icons/mob/clothing/feet.dmi'
+	json_config = 'code/datums/greyscale/json_configs/heels_worn.json'
+
+/datum/greyscale_config/bunnysuit
+	name = "Worn Bunny Suit"
+	icon_file = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bunnysuit.json'
+
+/datum/greyscale_config/bunnysuit_worn
+	name = "Worn Bunny Suit"
+	icon_file = 'monkestation/icons/mob/clothing/uniform.dmi'
+	json_config = 'code/datums/greyscale/json_configs/bunnysuit_worn.json'
+
+/datum/greyscale_config/playbunnyears
+	name = "Playbunny Ears"
+	icon_file = 'monkestation/icons/obj/clothing/hats.dmi'
+	json_config = 'code/datums/greyscale/json_configs/playbunny_ears.json'
+
+/datum/greyscale_config/playbunnyears_worn
+	name = "Worn Playbunny Ears"
+	icon_file = 'monkestation/icons/mob/clothing/head_32x48.dmi'
+	json_config = 'code/datums/greyscale/json_configs/playbunny_ears_worn.json'

code/datums/greyscale/json_configs/bowtie_collar.json

@@ -0,0 +1,30 @@
+{
+	"bowtie_collar_tied": [
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_base_tied",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_bowtie_tied",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	],
+	"bowtie_collar_untied": [
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_base_untied",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_bowtie_untied",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bowtie_collar_worn.json

@@ -0,0 +1,30 @@
+{
+	"bowtie_collar_tied": [
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_base_tied",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_bowtie_tied",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	],
+	"bowtie_collar_untied": [
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_base_untied",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "bowtie_collar_bowtie_untied",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bunnysuit.json

@@ -0,0 +1,28 @@
+{
+	"playbunny": [
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_buttons",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_cuffs",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_stockings",
+			"blend_mode": "overlay",
+			"color_ids": [ 4 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/bunnysuit_worn.json

@@ -0,0 +1,59 @@
+{
+	"playbunny": [
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_buttons",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_cuffs",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_stockings",
+			"blend_mode": "overlay",
+			"color_ids": [ 4 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_tail",
+			"blend_mode": "overlay"
+		}
+	],
+	"playbunny_d": [
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_base_d",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_buttons",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_cuffs",
+			"blend_mode": "overlay",
+			"color_ids": [ 3 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_stockings",
+			"blend_mode": "overlay",
+			"color_ids": [ 4 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/heels.json

@@ -0,0 +1,10 @@
+{
+	"heels": [
+		{
+			"type": "icon_state",
+			"icon_state": "heels",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/heels_worn.json

@@ -0,0 +1,10 @@
+{
+	"heels": [
+		{
+			"type": "icon_state",
+			"icon_state": "heels",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/playbunny_ears.json

@@ -0,0 +1,10 @@
+{
+	"playbunny_ears": [
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_ears",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/playbunny_ears_worn.json

@@ -0,0 +1,10 @@
+{
+	"playbunny_ears": [
+		{
+			"type": "icon_state",
+			"icon_state": "playbunny_ears",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/tailcoat.json

@@ -0,0 +1,10 @@
+{
+	"tailcoat": [
+		{
+			"type": "icon_state",
+			"icon_state": "tailcoat",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/tailcoat_bar.json

@@ -0,0 +1,16 @@
+{
+	"tailcoat_bar": [
+		{
+			"type": "icon_state",
+			"icon_state": "tailcoat_bar_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "tailcoat_bar_tail",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/tailcoat_bar_worn.json

@@ -0,0 +1,16 @@
+{
+	"tailcoat_bar": [
+		{
+			"type": "icon_state",
+			"icon_state": "tailcoat_bar_base",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "tailcoat_bar_tail",
+			"blend_mode": "overlay",
+			"color_ids": [ 2 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/tailcoat_worn.json

@@ -0,0 +1,10 @@
+{
+	"tailcoat": [
+		{
+			"type": "icon_state",
+			"icon_state": "tailcoat",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/modules/clothing/neck/_neck.dm

@@ -35,6 +35,8 @@
 	var/tie_timer = 4 SECONDS
 	/// Is this tie a clip-on, meaning it does not have an untied state?
 	var/clip_on = FALSE
+	/// MONKESTATION EDIT Base icon_state name between tied and untied versions.
+	var/tie_type = "tie_greyscale"
 
 /obj/item/clothing/neck/tie/Initialize(mapload)
 	. = ..()
@@ -87,12 +89,12 @@
 		return
 	// Normal strip & equip delay, along with 2 second self equip since you need to squeeze your head through the hole.
 	if(is_tied)
-		icon_state = "tie_greyscale_tied"
+		icon_state = "[tie_type]_tied" //MONKESTATION EDIT
 		strip_delay = 4 SECONDS
 		equip_delay_other = 4 SECONDS
 		equip_delay_self = 2 SECONDS
 	else // Extremely quick strip delay, it's practically a ribbon draped around your neck
-		icon_state = "tie_greyscale_untied"
+		icon_state = "[tie_type]_untied" //MONKESTATION EDIT
 		strip_delay = 1 SECONDS
 		equip_delay_other = 1 SECONDS
 		equip_delay_self = 0

code/modules/vending/autodrobe.dm

@@ -147,6 +147,7 @@
 				/obj/item/clothing/suit/costume/cheongsam_red = 1,
 				/obj/item/clothing/suit/costume/cheongsam_blue = 1,
 				/obj/item/clothing/under/wonka = 1,
+				/obj/item/clothing/shoes/heels = 4, // MONKESTATION EDIT ADDITION
 			),
 		),
 		list(
@@ -191,6 +192,10 @@
 				/obj/item/clothing/neck/maid = 1,
 				/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
 				/obj/item/clothing/accessory/maidapron = 1,
+				/obj/item/clothing/under/costume/playbunny = 2, // MONKESTATION EDIT ADDITION
+				/obj/item/clothing/neck/tie/bunnytie = 2, // MONKESTATION EDIT ADDITION
+				/obj/item/clothing/head/playbunnyears = 2, // MONKESTATION EDIT ADDITION
+				/obj/item/clothing/suit/jacket/tailcoat = 2, // MONKESTATION EDIT ADDITION
 			),
 		),
 		list(

code/modules/vending/magivend.dm

@@ -13,6 +13,11 @@
 		/obj/item/clothing/suit/wizrobe/red = 1,
 		/obj/item/clothing/head/wizard/yellow = 1,
 		/obj/item/clothing/suit/wizrobe/yellow = 1,
+		/obj/item/clothing/head/wizard/magician = 1, //MONKESTATION ADDITION
+		/obj/item/clothing/suit/wizrobe/magician = 1, //MONKESTATION ADDITION
+		/obj/item/clothing/neck/tie/bunnytie/magician = 1, //MONKESTATION ADDITION
+		/obj/item/clothing/under/costume/playbunny/magician = 1, //MONKESTATION ADDITION
+		/obj/item/clothing/shoes/heels/magician = 1, //MONKESTATION ADDITION
 		/obj/item/clothing/shoes/sandal/magic = 1,
 		/obj/item/staff = 2,
 	)