diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index 4f7223a78f74..d826fdb8a408 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/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' diff --git a/code/datums/greyscale/json_configs/bowtie_collar.json b/code/datums/greyscale/json_configs/bowtie_collar.json new file mode 100644 index 000000000000..d777ec66b9b0 --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bowtie_collar_worn.json b/code/datums/greyscale/json_configs/bowtie_collar_worn.json new file mode 100644 index 000000000000..d777ec66b9b0 --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bunnysuit.json b/code/datums/greyscale/json_configs/bunnysuit.json new file mode 100644 index 000000000000..90e175b7775c --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bunnysuit_worn.json b/code/datums/greyscale/json_configs/bunnysuit_worn.json new file mode 100644 index 000000000000..d93b2040562d --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/heels.json b/code/datums/greyscale/json_configs/heels.json new file mode 100644 index 000000000000..d70fed1dcff9 --- /dev/null +++ b/code/datums/greyscale/json_configs/heels.json @@ -0,0 +1,10 @@ +{ + "heels": [ + { + "type": "icon_state", + "icon_state": "heels", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/heels_worn.json b/code/datums/greyscale/json_configs/heels_worn.json new file mode 100644 index 000000000000..d70fed1dcff9 --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/playbunny_ears.json b/code/datums/greyscale/json_configs/playbunny_ears.json new file mode 100644 index 000000000000..ba2755740171 --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/playbunny_ears_worn.json b/code/datums/greyscale/json_configs/playbunny_ears_worn.json new file mode 100644 index 000000000000..ba2755740171 --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/tailcoat.json b/code/datums/greyscale/json_configs/tailcoat.json new file mode 100644 index 000000000000..0ccf8d62b3d6 --- /dev/null +++ b/code/datums/greyscale/json_configs/tailcoat.json @@ -0,0 +1,10 @@ +{ + "tailcoat": [ + { + "type": "icon_state", + "icon_state": "tailcoat", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/tailcoat_bar.json b/code/datums/greyscale/json_configs/tailcoat_bar.json new file mode 100644 index 000000000000..41418598725f --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/tailcoat_bar_worn.json b/code/datums/greyscale/json_configs/tailcoat_bar_worn.json new file mode 100644 index 000000000000..41418598725f --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/tailcoat_worn.json b/code/datums/greyscale/json_configs/tailcoat_worn.json new file mode 100644 index 000000000000..0ccf8d62b3d6 --- /dev/null +++ b/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 ] + } + ] +} diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index c8182bcef185..4a778421bf50 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/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 diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index ae57ef392a02..cba46e7dff73 100644 --- a/code/modules/vending/autodrobe.dm +++ b/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( diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm index 2c9ef67fd8a5..8b67450f7fcd 100644 --- a/code/modules/vending/magivend.dm +++ b/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, ) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index ba5de6937034..a8f885663e60 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -305,10 +305,14 @@ /obj/item/clothing/under/rank/civilian/bartender = 2, /obj/item/clothing/under/rank/civilian/bartender/purple = 2, /obj/item/clothing/under/rank/civilian/bartender/skirt = 2, + /obj/item/clothing/under/costume/playbunny = 2, // MONKESTATION EDIT ADDITION + /obj/item/clothing/neck/tie/bunnytie = 2, // MONKESTATION EDIT ADDITION /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/suit/apron/purple_bartender = 2, /obj/item/clothing/head/soft/black = 2, + /obj/item/clothing/head/playbunnyears = 2, // MONKESTATION EDIT ADDITION /obj/item/clothing/shoes/sneakers/black = 2, + /obj/item/clothing/shoes/heels = 2, // MONKESTATION EDIT ADDITION /obj/item/reagent_containers/cup/rag = 2, /obj/item/storage/box/beanbag = 1, /obj/item/clothing/suit/armor/vest/alt = 1, @@ -321,6 +325,7 @@ ) premium = list( /obj/item/storage/box/dishdrive = 1, + /obj/item/clothing/suit/jacket/tailcoat/bartender = 2, // MONKESTATION EDIT ADDITION ) refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe payment_department = ACCOUNT_SRV diff --git a/monkestation/code/game/objects/items/storage/uplink_kits.dm b/monkestation/code/game/objects/items/storage/uplink_kits.dm index db51fd460d4c..073c2ef859a0 100644 --- a/monkestation/code/game/objects/items/storage/uplink_kits.dm +++ b/monkestation/code/game/objects/items/storage/uplink_kits.dm @@ -23,7 +23,22 @@ /obj/item/clothing/head/maidheadband/syndicate = 1, /obj/item/clothing/under/syndicate/skirt/maid = 1, /obj/item/clothing/gloves/combat/maid = 1, - /obj/item/clothing/accessory/maidapron/syndicate = 1,) + /obj/item/clothing/accessory/maidapron/syndicate = 1, + /obj/item/clothing/shoes/heels/syndicate = 1,) + generate_items_inside(items_inside, src) + +/obj/item/storage/box/syndibunny + name = "Syndicate bunny assassin outfit" + desc = "A box containing a high tech specialized syndicate... bunny suit?" + icon_state = "syndiebox" + +/obj/item/storage/box/syndibunny/PopulateContents() + var/static/items_inside = list( + /obj/item/clothing/head/playbunnyears/syndicate = 1, + /obj/item/clothing/under/syndicate/syndibunny = 1, + /obj/item/clothing/suit/jacket/tailcoat/syndicate = 1, + /obj/item/clothing/neck/tie/bunnytie/syndicate = 1, + /obj/item/clothing/shoes/heels/syndicate = 1,) generate_items_inside(items_inside, src) /obj/item/storage/box/syndie_kit/contractor_loadout diff --git a/monkestation/code/modules/clothing/head/costume.dm b/monkestation/code/modules/clothing/head/costume.dm index 605355b3a6f3..311472aef9bc 100644 --- a/monkestation/code/modules/clothing/head/costume.dm +++ b/monkestation/code/modules/clothing/head/costume.dm @@ -51,4 +51,75 @@ desc = "Keeps your brain intact when fighting heretics" icon = 'monkestation/icons/obj/clothing/hats.dmi' worn_icon = 'monkestation/icons/mob/clothing/head.dmi' - icon_state = "guardman_helmet" \ No newline at end of file + icon_state = "guardman_helmet" + +/* +BUNNY EARS +*/ + +/obj/item/clothing/head/playbunnyears + name = "bunny ears headband" + desc = "A pair of bunny ears attached to a headband. One of the ears is already crooked." + icon = 'monkestation/icons/obj/clothing/hats.dmi' + worn_icon = 'monkestation/icons/mob/clothing/head_32x48.dmi' + icon_state = "playbunny_ears" + clothing_flags = LARGE_WORN_ICON + greyscale_colors = "#39393f" + greyscale_config = /datum/greyscale_config/playbunnyears + greyscale_config_worn = /datum/greyscale_config/playbunnyears_worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/head/playbunnyears/syndicate + name = "blood-red bunny ears headband" + desc = "An unusually suspicious pair of bunny ears attached to a headband. The headband looks reinforced with plasteel... but why?" + icon_state = "syndibunny_ears" + clothing_flags = SNUG_FIT | LARGE_WORN_ICON + armor_type = /datum/armor/playbunnyears_syndicate + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/datum/armor/playbunnyears_syndicate + melee = 30 + bullet = 20 + laser = 30 + energy = 35 + fire = 20 + bomb = 15 + acid = 50 + wound = 5 + +/obj/item/clothing/head/playbunnyears/centcom + name = "centcom bunny ears headband" + desc = "A pair of very professional bunny ears attached to a headband. The ears themselves came from an endangered species of green rabbits" + icon_state = "playbunny_ears_centcom" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/british + name = "british bunny ears headband" + desc = "A pair of bunny ears attached to a headband. One of the ears is already crooked." + icon_state = "playbunny_ears_brit" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/communist + name = "really red bunny ears headband" + desc = "A pair of bunny ears attached to a headband. One of the ears is already crooked." + icon_state = "playbunny_ears_communist" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/head/playbunnyears/usa + name = "usa bunny ears headband" + desc = "A pair of bunny ears attached to a headband. One of the ears is already crooked." + icon_state = "playbunny_ears_usa" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null +/* +END OF BUNNY EARS +*/ diff --git a/monkestation/code/modules/clothing/head/hat.dm b/monkestation/code/modules/clothing/head/hat.dm index a15a21c1d771..079b0ea6ad82 100644 --- a/monkestation/code/modules/clothing/head/hat.dm +++ b/monkestation/code/modules/clothing/head/hat.dm @@ -2,3 +2,11 @@ name = "yellow jester hat" desc = "It's more a hood really." icon_state = "jester2" + +/obj/item/clothing/head/wizard/magician + name = "magician's top hat" + desc = "A purple tophat that looks like it might actually be magical." + icon = 'monkestation/icons/obj/clothing/hats.dmi' + worn_icon = 'monkestation/icons/mob/clothing/head_32x48.dmi' + icon_state = "tophat_wiz" + dog_fashion = null diff --git a/monkestation/code/modules/clothing/neck/neckties.dm b/monkestation/code/modules/clothing/neck/neckties.dm new file mode 100644 index 000000000000..567b08e2cd23 --- /dev/null +++ b/monkestation/code/modules/clothing/neck/neckties.dm @@ -0,0 +1,83 @@ +//Stuff that isn't cloaks +// BEGIN BUNNYTIES + +/obj/item/clothing/neck/tie/bunnytie + name = "bowtie collar" + desc = "A fancy tie that includes a collar. Looking snazzy." + icon = 'monkestation/icons/obj/clothing/necks.dmi' + worn_icon = 'monkestation/icons/mob/clothing/neck.dmi' + icon_state = "bowtie_collar_tied" + tie_type = "bowtie_collar" + greyscale_colors = "#ffffff#39393f" + greyscale_config = /datum/greyscale_config/bowtie_collar + greyscale_config_worn = /datum/greyscale_config/bowtie_collar_worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/neck/tie/bunnytie/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/syndicate + name = "blood-red bowtie collar" + desc = "A fancy tie that includes a red collar. Looking sinister." + icon_state = "bowtie_collar_syndi_tied" + tie_type = "bowtie_collar_syndi" + armor_type = /datum/armor/bunnytie_syndicate + tie_timer = 2 SECONDS //Tactical tie + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/syndicate/tied + is_tied = TRUE + +/datum/armor/bunnytie_syndicate + fire = 30 + acid = 20 + +/obj/item/clothing/neck/tie/bunnytie/magician + name = "magician's bowtie collar" + desc = "A fancy gold tie that includes a collar. Looking magical." + icon_state = "bowtie_collar_wiz_tied" + tie_type = "bowtie_collar_wiz" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + custom_price = null + +/obj/item/clothing/neck/tie/bunnytie/magician/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/centcom + name = "centcom bowtie collar" + icon_state = "bowtie_collar_centcom_tied" + tie_type = "bowtie_collar_centcom" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/centcom/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/communist + name = "really red bowtie collar" + icon_state = "bowtie_collar_communist_tied" + tie_type = "bowtie_collar_communist" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/communist/tied + is_tied = TRUE + +/obj/item/clothing/neck/tie/bunnytie/blue + name = "blue bowtie collar" + icon_state = "bowtie_collar_blue_tied" + tie_type = "bowtie_collar_blue" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/neck/tie/bunnytie/blue/tied + is_tied = TRUE + +//END BUNNYTIES diff --git a/monkestation/code/modules/clothing/outfits/bunny.dm b/monkestation/code/modules/clothing/outfits/bunny.dm new file mode 100644 index 000000000000..c14b3da88b6e --- /dev/null +++ b/monkestation/code/modules/clothing/outfits/bunny.dm @@ -0,0 +1,101 @@ +/datum/outfit/bunny_waiter + name = "Bunny Waiter" + uniform = /obj/item/clothing/under/costume/playbunny + back = /obj/item/storage/backpack/satchel + box = /obj/item/storage/box/survival + suit = /obj/item/clothing/suit/jacket/tailcoat + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/heels + head = /obj/item/clothing/head/playbunnyears + neck = /obj/item/clothing/neck/tie/bunnytie/tied + ears = /obj/item/radio/headset/headset_srv + id = /obj/item/card/id/advanced + id_trim = /datum/id_trim/job/bartender + r_pocket = /obj/item/reagent_containers/cup/rag + l_pocket = /obj/item/toy/cards/deck + l_hand = /obj/item/storage/bag/tray + undershirt = "Nude" + +/datum/outfit/bunny_waiter/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return + + var/obj/item/card/id/W = H.wear_id + W.registered_name = H.real_name + W.update_label() + W.update_icon() + return ..() + +/datum/outfit/bunny_waiter/syndicate + name = "Syndicate Bunny Assassin" + uniform = /obj/item/clothing/under/syndicate/syndibunny + suit = /obj/item/clothing/suit/jacket/tailcoat/syndicate + shoes = /obj/item/clothing/shoes/heels/syndicate + neck = /obj/item/clothing/neck/tie/bunnytie/syndicate/tied + ears = /obj/item/radio/headset/syndicate + id = /obj/item/card/id/advanced/chameleon + suit_store = /obj/item/gun/ballistic/automatic/pistol/suppressed + l_pocket = /obj/item/toy/cards/deck/syndicate + +/datum/outfit/bunny_waiter/british_waiter + name = "Bunny Waiter (British)" + uniform = /obj/item/clothing/under/costume/playbunny/british + suit = /obj/item/clothing/suit/jacket/tailcoat/british + shoes = /obj/item/clothing/shoes/heels/blue + head = /obj/item/clothing/head/playbunnyears/british + neck = /obj/item/clothing/neck/tie/bunnytie/blue + +/datum/outfit/bunny_waiter/communist_waiter + name = "Bunny Waiter (Communist)" + uniform = /obj/item/clothing/under/costume/playbunny/communist + suit = /obj/item/clothing/suit/jacket/tailcoat/communist + shoes = /obj/item/clothing/shoes/heels/red + head = /obj/item/clothing/head/playbunnyears/communist + neck = /obj/item/clothing/neck/tie/bunnytie/communist + +/datum/outfit/bunny_waiter/usa_waiter + name = "Bunny Waiter (USA)" + uniform = /obj/item/clothing/under/costume/playbunny/usa + suit = /obj/item/clothing/suit/jacket/tailcoat/usa + shoes = /obj/item/clothing/shoes/heels/red + head = /obj/item/clothing/head/playbunnyears/usa + neck = /obj/item/clothing/neck/tie/bunnytie/blue + +/datum/outfit/wizard/bunny_magician + name = "Bunny Magician" + uniform = /obj/item/clothing/under/costume/playbunny/magician + suit = /obj/item/clothing/suit/wizrobe/magician + back = /obj/item/storage/backpack/satchel/leather + head = /obj/item/clothing/head/wizard/magician + shoes = /obj/item/clothing/shoes/heels/magician + neck = /obj/item/clothing/neck/tie/bunnytie/magician/tied + l_hand = /obj/item/gun/magic/wand/nothing + l_pocket = /obj/item/toy/cards/deck/tarot + undershirt = "Nude" + +/datum/outfit/centcom/centcom_bunny + name = "Bunny Waiter (CentCom)" + uniform = /obj/item/clothing/under/costume/playbunny/centcom + back = /obj/item/storage/backpack/satchel/leather + box = /obj/item/storage/box/survival + suit = /obj/item/clothing/suit/jacket/tailcoat/centcom + gloves = /obj/item/clothing/gloves/color/white + shoes = /obj/item/clothing/shoes/heels/centcom + head = /obj/item/clothing/head/playbunnyears/centcom + neck = /obj/item/clothing/neck/tie/bunnytie/centcom/tied + ears = /obj/item/radio/headset/headset_cent + id = /obj/item/card/id/advanced/centcom + r_pocket = /obj/item/reagent_containers/cup/rag + suit_store = /obj/item/toy/cards/deck + l_hand = /obj/item/storage/bag/tray + undershirt = "Nude" + +/datum/outfit/centcom/centcom_bunny/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return + + var/obj/item/card/id/W = H.wear_id + W.registered_name = H.real_name + W.update_label() + W.update_icon() + return ..() diff --git a/monkestation/code/modules/clothing/shoes/shoe.dm b/monkestation/code/modules/clothing/shoes/shoe.dm index 2f1cc4b7366e..866471173e20 100644 --- a/monkestation/code/modules/clothing/shoes/shoe.dm +++ b/monkestation/code/modules/clothing/shoes/shoe.dm @@ -39,3 +39,64 @@ icon = 'monkestation/icons/obj/clothing/shoes.dmi' worn_icon = 'monkestation/icons/mob/clothing/feet.dmi' icon_state = "cowboyboots_black" + +//START HEELS + +/obj/item/clothing/shoes/heels + name = "heels" + desc = "A both professional and stylish pair of footwear that are difficult to walk in." + icon = 'monkestation/icons/obj/clothing/shoes.dmi' + worn_icon = 'monkestation/icons/mob/clothing/feet.dmi' + icon_state = "heels" + can_be_tied = FALSE + greyscale_colors = "#39393f" + greyscale_config = /datum/greyscale_config/heels + greyscale_config_worn = /datum/greyscale_config/heels_worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/shoes/heels/syndicate + name = "heels" + desc = "A both professional and stylish pair of footwear that are shockingly comfortable to walk in. They have have been sharpened to allow them to be used as a rudimentary weapon." + icon_state = "heels_syndi" + hitsound = 'sound/weapons/bladeslice.ogg' + strip_delay = 2 SECONDS + force = 5 + throwforce = 10 + attack_verb_continuous = list("attacks", "slices", "dices", "slashes", "cuts") + attack_verb_simple = list("attack", "slice", "dice", "slash", "cut") + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/shoes/heels/magician + name = "magical heels" + desc = "A pair of heels that seem to magically solve all the problems with walking in heels." + icon_state = "heels_wiz" + strip_delay = 2 SECONDS + resistance_flags = FIRE_PROOF | ACID_PROOF + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/shoes/heels/centcom + name = "green heels" + desc = "A stylish piece of corporate footwear, its ergonomic design makes it easier to both run and work in than the average pair of heels." + icon_state = "heels_centcom" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/shoes/heels/red + name = "red heels" + icon_state = "heels_red" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null + +/obj/item/clothing/shoes/heels/blue + name = "blue heels" + icon_state = "heels_blue" + greyscale_colors = null + greyscale_config = null + greyscale_config_worn = null +//END HEELS diff --git a/monkestation/code/modules/clothing/suits/coats.dm b/monkestation/code/modules/clothing/suits/coats.dm index 5b5eaef23c23..d309fa03e879 100644 --- a/monkestation/code/modules/clothing/suits/coats.dm +++ b/monkestation/code/modules/clothing/suits/coats.dm @@ -189,4 +189,122 @@ /obj/item/clothing/suit/armor/secduster/science name = "science security duster" icon_state = "cowboy_sec_science" - masktype = /obj/item/clothing/mask/breath/sec_bandana/science \ No newline at end of file + masktype = /obj/item/clothing/mask/breath/sec_bandana/science + +//End of Sec Dusters + +//Bunny costume Jackets + +/obj/item/clothing/suit/jacket/tailcoat //parent type + name = "tailcoat" + desc = "A coat usually worn by bunny themed waiters and the like." + worn_icon = 'monkestation/icons/mob/clothing/suit.dmi' + icon = 'monkestation/icons/obj/clothing/suits.dmi' + icon_state = "tailcoat" + greyscale_colors = "#39393f" + greyscale_config = /datum/greyscale_config/tailcoat + greyscale_config_worn = /datum/greyscale_config/tailcoat_worn + flags_1 = IS_PLAYER_COLORABLE_1 + +/obj/item/clothing/suit/jacket/tailcoat/bartender + name = "bartender's tailcoat" + desc = "A coat usually worn by bunny themed bartenders. It has an interior holster for firearms and some extra padding for minor protection." + icon_state = "tailcoat_bar" + greyscale_colors = "#39393f#ffffff" + greyscale_config = /datum/greyscale_config/tailcoat_bar + greyscale_config_worn = /datum/greyscale_config/tailcoat_bar_worn + armor_type = /datum/armor/tailcoat_bar + +/datum/armor/tailcoat_bar + melee = 15 + bullet = 10 + laser = 10 + energy = 15 + fire = 20 + bomb = 10 + acid = 20 + wound = 5 + +/obj/item/clothing/suit/jacket/tailcoat/bartender/Initialize(mapload) //so bartenders can use cram their shotgun inside + . = ..() + allowed += list( + /obj/item/ammo_box, + /obj/item/ammo_casing, + /obj/item/gun/ballistic, + /obj/item/gun/energy, + ) +/obj/item/clothing/suit/jacket/tailcoat/syndicate + name = "suspicious tailcoat" + desc = "A oddly intimidating coat usually worn by bunny themed assassins. It's reinforced with some extremely flexible lightweight alloy. How much did they pay for this?" + icon_state = "tailcoat_syndi" + armor_type = /datum/armor/tailcoat_syndi + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + + +/datum/armor/tailcoat_syndi + melee = 30 + bullet = 25 + laser = 30 + energy = 35 + fire = 50 + bomb = 20 + acid = 50 + wound = 10 + +/obj/item/clothing/suit/jacket/tailcoat/syndicate/Initialize(mapload) + . = ..() + allowed += list( + /obj/item/ammo_box, + /obj/item/ammo_casing, + /obj/item/gun/ballistic, + /obj/item/gun/energy, + /obj/item/restraints/handcuffs, + /obj/item/knife/combat, + /obj/item/melee/baton, + ) + +/obj/item/clothing/suit/wizrobe/magician //Not really a robe but it's MAGIC + name = "magician's tailcoat" + desc = "A magnificent, gold-lined tailcoat that seems to radiate power." + worn_icon = 'monkestation/icons/mob/clothing/suit.dmi' + icon = 'monkestation/icons/obj/clothing/suits.dmi' + icon_state = "tailcoat_wiz" + inhand_icon_state = null + flags_inv = null + +/obj/item/clothing/suit/jacket/tailcoat/centcom + name = "Centcom tailcoat" + desc = "An official coat usually worn by bunny themed executives. The inside is lined with comfortable yet tasteful bunny fluff." + icon_state = "tailcoat_centcom" + armor_type = /datum/armor/armor_centcom_formal + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/british + name = "british flag tailcoat" + desc = "Spot of tea anyone?" + icon_state = "tailcoat_brit" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/communist + name = "really red tailcoat" + desc = "A red tailcoat with a star on the back." + icon_state = "tailcoat_communist" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/suit/jacket/tailcoat/usa + name = "stars tailcoat" + desc = "A blue tailcoat speckled with white stars." + icon_state = "tailcoat_stars" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +//End of Bunny Costume Jackets diff --git a/monkestation/code/modules/clothing/under/costume.dm b/monkestation/code/modules/clothing/under/costume.dm index d3d452cc6053..7fac50d639d0 100644 --- a/monkestation/code/modules/clothing/under/costume.dm +++ b/monkestation/code/modules/clothing/under/costume.dm @@ -123,3 +123,68 @@ name = "sexy green christmas costume" desc = "Stupid. Ugly. Out of date. If I can't find something nice to wear I'm not going." icon_state = "christmas_crop_green" + +/* +BUNNY SUITS +*/ +/obj/item/clothing/under/costume/playbunny + name = "bunny suit" + desc = "The staple of any bunny themed waiters and the like. It has a little cottonball tail too." + icon = 'monkestation/icons/obj/clothing/uniforms.dmi' + worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi' + icon_state = "playbunny" + greyscale_colors = "#39393f#39393f#ffffff#87502e" + greyscale_config = /datum/greyscale_config/bunnysuit + greyscale_config_worn = /datum/greyscale_config/bunnysuit_worn + flags_1 = IS_PLAYER_COLORABLE_1 + body_parts_covered = CHEST|GROIN|LEGS + alt_covers_chest = TRUE + +/obj/item/clothing/under/syndicate/syndibunny //heh + name = "blood-red bunny suit" + desc = "The staple of any bunny themed syndicate assassins. Are those carbon nanotube stockings?" + icon = 'monkestation/icons/obj/clothing/uniforms.dmi' + worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi' + icon_state = "syndibunny" + body_parts_covered = CHEST|GROIN|LEGS + +/obj/item/clothing/under/costume/playbunny/magician + name = "magician's bunny suit" + desc = "The staple of any bunny themed stage magician." + icon_state = "playbunny_wiz" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/centcom + name = "centcom bunnysuit" + desc = "A modified Centcom version of a bunny outfit, using Lunarian technology to condense countless amounts of rabbits into a material that is extremely comfortable and light to wear." + icon_state = "playbunny_centcom" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/british + name = "british bunny suit" + icon_state = "playbunny_brit" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/communist + name = "really red bunny suit" + icon_state = "playbunny_communist" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/obj/item/clothing/under/costume/playbunny/usa + name = "striped bunny suit" + icon_state = "playbunny_usa" + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null + +/* +END OF BUNNY SUITS +*/ diff --git a/monkestation/code/modules/loadouts/items/heads.dm b/monkestation/code/modules/loadouts/items/heads.dm index 11ea1a67f6a9..0091adfe7bc8 100644 --- a/monkestation/code/modules/loadouts/items/heads.dm +++ b/monkestation/code/modules/loadouts/items/heads.dm @@ -274,6 +274,10 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea name = "Natural Wig" item_path = /obj/item/clothing/head/wig/natural +/datum/loadout_item/head/bunnyears + name = "Colorable Bunny Ears" + item_path = /obj/item/clothing/head/playbunnyears + /* * JOB-LOCKED */ diff --git a/monkestation/code/modules/loadouts/items/neck.dm b/monkestation/code/modules/loadouts/items/neck.dm index 8a74a7d074e5..10a0e076570a 100644 --- a/monkestation/code/modules/loadouts/items/neck.dm +++ b/monkestation/code/modules/loadouts/items/neck.dm @@ -137,6 +137,10 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck) name = "Maid Neck Cover" item_path = /obj/item/clothing/neck/maid +/datum/loadout_item/neck/bowtie_collar + name = "Colorable Bowtie Collar" + item_path = /obj/item/clothing/neck/tie/bunnytie/tied + /datum/loadout_item/neck/boatcloak name = "Boat cloak" item_path = /obj/item/clothing/neck/boatcloak diff --git a/monkestation/code/modules/loadouts/items/shoes.dm b/monkestation/code/modules/loadouts/items/shoes.dm index d6aa263eca5f..e01e4c767ffd 100644 --- a/monkestation/code/modules/loadouts/items/shoes.dm +++ b/monkestation/code/modules/loadouts/items/shoes.dm @@ -129,6 +129,9 @@ GLOBAL_LIST_INIT(loadout_shoes, generate_loadout_items(/datum/loadout_item/shoes name = "Sandals" item_path = /obj/item/clothing/shoes/sandal +/datum/loadout_item/shoes/heels + name = "Colorable Heels" + item_path = /obj/item/clothing/shoes/heels /* * JOB-RESTRICTED diff --git a/monkestation/code/modules/loadouts/items/suits.dm b/monkestation/code/modules/loadouts/items/suits.dm index e8b57022eba9..cd2c1378e7a5 100644 --- a/monkestation/code/modules/loadouts/items/suits.dm +++ b/monkestation/code/modules/loadouts/items/suits.dm @@ -133,11 +133,14 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su name = "Recolorable Fancy Fur Coat" item_path = /obj/item/clothing/suit/jacket/fancy +/datum/loadout_item/suit/tailcoat + name = "Recolorable Tailcoat" + item_path = /obj/item/clothing/suit/jacket/tailcoat + /datum/loadout_item/suit/ethereal_raincoat name = "Ethereal Raincoat" item_path = /obj/item/clothing/suit/hooded/ethereal_raincoat - /* * COSTUMES */ @@ -275,6 +278,13 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su item_path = /obj/item/clothing/suit/hooded/wintercoat/miner restricted_roles = list(JOB_QUARTERMASTER, JOB_SHAFT_MINER) // Reserved for Miners and their boss, the Quartermaster +// JACKETS + +/datum/loadout_item/suit/tailcoat_bartender + name = "Bartender's Tailcoat" + item_path = /obj/item/clothing/suit/jacket/tailcoat/bartender + restricted_roles = list(JOB_BARTENDER) + /* * FAMILIES */ diff --git a/monkestation/code/modules/loadouts/items/under/under.dm b/monkestation/code/modules/loadouts/items/under/under.dm index a8b52d2c1f44..9a94f31afe3f 100644 --- a/monkestation/code/modules/loadouts/items/under/under.dm +++ b/monkestation/code/modules/loadouts/items/under/under.dm @@ -260,6 +260,10 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ name = "Tragic Mime Suit" item_path = /obj/item/clothing/under/costume/tragic +/datum/loadout_item/under/miscellaneous/bunnysuit + name = "Colorable Bunny Suit" + item_path = /obj/item/clothing/under/costume/playbunny + /* * FORMAL UNDERSUITS */ diff --git a/monkestation/code/modules/store/store_items/head.dm b/monkestation/code/modules/store/store_items/head.dm index 1b7a0926cc0b..40387c33b451 100644 --- a/monkestation/code/modules/store/store_items/head.dm +++ b/monkestation/code/modules/store/store_items/head.dm @@ -272,6 +272,11 @@ GLOBAL_LIST_INIT(store_head, generate_store_items(/datum/store_item/head)) item_path = /obj/item/clothing/head/costume/nemes item_cost = 2000 +/datum/store_item/head/bunnyears + name = "Colorable Bunny Ears" + item_path = /obj/item/clothing/head/playbunnyears + item_cost = 5000 + /* * JOB-LOCKED */ diff --git a/monkestation/code/modules/store/store_items/neck.dm b/monkestation/code/modules/store/store_items/neck.dm index 610582465683..707793320957 100644 --- a/monkestation/code/modules/store/store_items/neck.dm +++ b/monkestation/code/modules/store/store_items/neck.dm @@ -171,3 +171,7 @@ GLOBAL_LIST_INIT(store_neck, generate_store_items(/datum/store_item/neck)) name = "Maid Neck Cover" item_path = /obj/item/clothing/neck/maid item_cost = 7500 //work for it + +/datum/store_item/neck/bowtie_collar + name = "Colorable Bowtie Collar" + item_path = /obj/item/clothing/neck/tie/bunnytie/tied diff --git a/monkestation/code/modules/store/store_items/shoes.dm b/monkestation/code/modules/store/store_items/shoes.dm index 757446381d31..f58354fdfb5b 100644 --- a/monkestation/code/modules/store/store_items/shoes.dm +++ b/monkestation/code/modules/store/store_items/shoes.dm @@ -96,7 +96,6 @@ GLOBAL_LIST_INIT(store_shoes, generate_store_items(/datum/store_item/shoes)) item_path = /obj/item/clothing/shoes/discoshoes item_cost = 6000 - /datum/store_item/shoes/griffin name = "Griffon Boots" item_path = /obj/item/clothing/shoes/griffin @@ -105,6 +104,9 @@ GLOBAL_LIST_INIT(store_shoes, generate_store_items(/datum/store_item/shoes)) name = "Sandals" item_path = /obj/item/clothing/shoes/sandal +/datum/store_item/shoes/heels + name = "Colorable Heels" + item_path = /obj/item/clothing/shoes/heels /* * JOB-RESTRICTED diff --git a/monkestation/code/modules/store/store_items/suits.dm b/monkestation/code/modules/store/store_items/suits.dm index 67a2c9b80aa4..cfe23077216d 100644 --- a/monkestation/code/modules/store/store_items/suits.dm +++ b/monkestation/code/modules/store/store_items/suits.dm @@ -121,6 +121,11 @@ GLOBAL_LIST_INIT(store_suits, generate_store_items(/datum/store_item/suit)) item_path = /obj/item/clothing/suit/jacket/fancy item_cost = 3000 +/datum/store_item/suit/jacket/tailcoat + name = "Recolorable Tailcoat" + item_path = /obj/item/clothing/suit/jacket/tailcoat + item_cost = 3000 + /datum/store_item/suit/ethereal_raincoat name = "Ethereal Raincoat" item_path = /obj/item/clothing/suit/hooded/ethereal_raincoat @@ -271,6 +276,12 @@ GLOBAL_LIST_INIT(store_suits, generate_store_items(/datum/store_item/suit)) name = "Mining Winter Coat" item_path = /obj/item/clothing/suit/hooded/wintercoat/miner +//JACKETS + +/datum/store_item/suit/jacket/tailcoat_bar + name = "Bartender's Tailcoat" + item_path = /obj/item/clothing/suit/jacket/tailcoat/bartender + /* * FAMILIES */ diff --git a/monkestation/code/modules/store/store_items/under.dm b/monkestation/code/modules/store/store_items/under.dm index 48d0d052d7f2..c07e33129a1c 100644 --- a/monkestation/code/modules/store/store_items/under.dm +++ b/monkestation/code/modules/store/store_items/under.dm @@ -236,6 +236,9 @@ GLOBAL_LIST_INIT(store_miscunders, generate_store_items(/datum/store_item/under/ name = "Tragic Mime Suit" item_path = /obj/item/clothing/under/costume/tragic +/datum/store_item/under/miscellaneous/bunnysuit + name = "Colorable Bunny Suit" + item_path = /obj/item/clothing/under/costume/playbunny /* * FORMAL UNDERSUITS */ diff --git a/monkestation/code/modules/uplink/uplink_items/badass.dm b/monkestation/code/modules/uplink/uplink_items/badass.dm index 82cefc6d81f9..bf735ae2ba18 100644 --- a/monkestation/code/modules/uplink/uplink_items/badass.dm +++ b/monkestation/code/modules/uplink/uplink_items/badass.dm @@ -6,3 +6,12 @@ purchasable_from = ALL limited_stock = 1 cant_discount = TRUE + +/datum/uplink_item/badass/costumes/syndibunny + name = "Syndicate Bunny Suit" + desc = "A box containing a bunny suit and tailcoat. Due to a catastrophic typo we recieved a specialized syndicate bunny suit instead of a battle suit. Just get rid of it." + item = /obj/item/storage/box/syndibunny + cost = 4 + purchasable_from = ALL + limited_stock = 1 + cant_discount = TRUE diff --git a/monkestation/icons/mob/clothing/feet.dmi b/monkestation/icons/mob/clothing/feet.dmi index 79a7a4a5ceea..49de917cf855 100644 Binary files a/monkestation/icons/mob/clothing/feet.dmi and b/monkestation/icons/mob/clothing/feet.dmi differ diff --git a/monkestation/icons/mob/clothing/head_32x48.dmi b/monkestation/icons/mob/clothing/head_32x48.dmi new file mode 100644 index 000000000000..baccd315fed4 Binary files /dev/null and b/monkestation/icons/mob/clothing/head_32x48.dmi differ diff --git a/monkestation/icons/mob/clothing/neck.dmi b/monkestation/icons/mob/clothing/neck.dmi index d86a09d9bdeb..93ecdfdbd2d7 100644 Binary files a/monkestation/icons/mob/clothing/neck.dmi and b/monkestation/icons/mob/clothing/neck.dmi differ diff --git a/monkestation/icons/mob/clothing/suit.dmi b/monkestation/icons/mob/clothing/suit.dmi index 1b70659c3ff5..9064e1801d98 100644 Binary files a/monkestation/icons/mob/clothing/suit.dmi and b/monkestation/icons/mob/clothing/suit.dmi differ diff --git a/monkestation/icons/mob/clothing/uniform.dmi b/monkestation/icons/mob/clothing/uniform.dmi index 73bc2cad1d17..d4919cb55167 100644 Binary files a/monkestation/icons/mob/clothing/uniform.dmi and b/monkestation/icons/mob/clothing/uniform.dmi differ diff --git a/monkestation/icons/obj/clothing/hats.dmi b/monkestation/icons/obj/clothing/hats.dmi index 1c4b19126ce8..468845fa1707 100644 Binary files a/monkestation/icons/obj/clothing/hats.dmi and b/monkestation/icons/obj/clothing/hats.dmi differ diff --git a/monkestation/icons/obj/clothing/necks.dmi b/monkestation/icons/obj/clothing/necks.dmi index 829d38c3c3a3..d6ac2f1156dd 100644 Binary files a/monkestation/icons/obj/clothing/necks.dmi and b/monkestation/icons/obj/clothing/necks.dmi differ diff --git a/monkestation/icons/obj/clothing/shoes.dmi b/monkestation/icons/obj/clothing/shoes.dmi index e77c47429aba..3982a8cff6dc 100644 Binary files a/monkestation/icons/obj/clothing/shoes.dmi and b/monkestation/icons/obj/clothing/shoes.dmi differ diff --git a/monkestation/icons/obj/clothing/suits.dmi b/monkestation/icons/obj/clothing/suits.dmi index 5ab7bb4c7604..984b17619a88 100644 Binary files a/monkestation/icons/obj/clothing/suits.dmi and b/monkestation/icons/obj/clothing/suits.dmi differ diff --git a/monkestation/icons/obj/clothing/uniforms.dmi b/monkestation/icons/obj/clothing/uniforms.dmi index b2561f758527..d67db6833bf3 100644 Binary files a/monkestation/icons/obj/clothing/uniforms.dmi and b/monkestation/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 0c697a240e5b..2387286375dd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6089,6 +6089,8 @@ #include "monkestation\code\modules\clothing\masks\gasmask.dm" #include "monkestation\code\modules\clothing\masks\misc.dm" #include "monkestation\code\modules\clothing\neck\cloaks.dm" +#include "monkestation\code\modules\clothing\neck\neckties.dm" +#include "monkestation\code\modules\clothing\outfits\bunny.dm" #include "monkestation\code\modules\clothing\shoes\clown.dm" #include "monkestation\code\modules\clothing\shoes\shoe.dm" #include "monkestation\code\modules\clothing\spacesuits\plasmamen.dm"