From ed3b89853e65c96c233e50c5de12b66e8136dd9f Mon Sep 17 00:00:00 2001 From: Feenie Date: Wed, 9 Oct 2024 19:02:37 +0300 Subject: [PATCH] Bunny fix --- tff_modular/modules/bunny/code/bunnydrobe.dm | 28 ++- .../modules/bunny/code/clothing/suit.dm | 9 +- .../modules/bunny/code/clothing/under.dm | 217 ------------------ .../modules/vending/vends/autodrobe.dm | 8 +- tff_modular/modules/vending/vends/clothing.dm | 82 ++++--- .../vending/vends/wardrobe/cent_wardrobe.dm | 10 + .../vending/vends/wardrobe/magivend.dm | 7 + .../vending/vends/wardrobe/sec_wardrobe.dm | 54 +++-- .../vending/vends/wardrobe/syndie_wardrobe.dm | 8 + tgstation.dme | 3 + 10 files changed, 140 insertions(+), 286 deletions(-) create mode 100644 tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm create mode 100644 tff_modular/modules/vending/vends/wardrobe/magivend.dm create mode 100644 tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm diff --git a/tff_modular/modules/bunny/code/bunnydrobe.dm b/tff_modular/modules/bunny/code/bunnydrobe.dm index d65f8faed8c..5dd9a15cc06 100644 --- a/tff_modular/modules/bunny/code/bunnydrobe.dm +++ b/tff_modular/modules/bunny/code/bunnydrobe.dm @@ -65,8 +65,28 @@ /obj/item/clothing/head/playbunnyears/centcom = 3, ) access_lists["[ACCESS_COMMAND]"] = list( - /obj/item/clothing/under/rank/captain/bunnysuit = 3, - /obj/item/clothing/suit/armor/vest/capcarapace/tailcoat_captain = 3, - /obj/item/clothing/neck/bunny/bunnytie/captain = 3, - /obj/item/clothing/head/hats/caphat/bunnyears_captain = 3, + /obj/item/clothing/shoes/fancy_heels/cc = 3, + /obj/item/clothing/shoes/fancy_heels/red = 3, + /obj/item/clothing/shoes/fancy_heels/blue = 3, + /obj/item/clothing/shoes/fancy_heels/lightgrey = 3, + /obj/item/clothing/shoes/fancy_heels/navyblue = 3, + /obj/item/clothing/shoes/fancy_heels/white = 3, + /obj/item/clothing/shoes/fancy_heels/darkblue = 3, + /obj/item/clothing/shoes/fancy_heels/black = 3, + /obj/item/clothing/shoes/fancy_heels/purple = 3, + /obj/item/clothing/shoes/fancy_heels/red = 3, + /obj/item/clothing/shoes/fancy_heels/grey = 3, + /obj/item/clothing/shoes/fancy_heels/brown = 3, + /obj/item/clothing/shoes/fancy_heels/orange = 3, + /obj/item/clothing/shoes/jackboots/gogo_boots = 3, + /obj/item/clothing/shoes/fancy_heels/lightblue = 3, + /obj/item/clothing/shoes/galoshes/heeled = 3, + /obj/item/clothing/shoes/fancy_heels/green = 3, + /obj/item/clothing/shoes/clown_shoes/heeled = 3, + /obj/item/clothing/shoes/fancy_heels/darkgreen = 3, + /obj/item/clothing/shoes/fancy_heels/teal = 3, + /obj/item/clothing/shoes/fancy_heels/mutedblack = 3, + /obj/item/clothing/shoes/fancy_heels/mutedblue = 3, + /obj/item/clothing/shoes/fancy_heels/beige = 3, + /obj/item/clothing/shoes/fancy_heels/darkgrey = 3, ) diff --git a/tff_modular/modules/bunny/code/clothing/suit.dm b/tff_modular/modules/bunny/code/clothing/suit.dm index de48b1af5d8..8500b3bd1df 100644 --- a/tff_modular/modules/bunny/code/clothing/suit.dm +++ b/tff_modular/modules/bunny/code/clothing/suit.dm @@ -105,7 +105,7 @@ icon = 'tff_modular/modules/bunny/icons/obj/suit.dmi' w_class = WEIGHT_CLASS_NORMAL body_parts_covered = CHEST|GROIN|ARMS - slowdown = 0 + slowdown = 1 armor_type = /datum/armor/atmos_tech_tailcoat flags_inv = null clothing_flags = null @@ -132,7 +132,7 @@ icon = 'tff_modular/modules/bunny/icons/obj/suit.dmi' w_class = WEIGHT_CLASS_NORMAL body_parts_covered = CHEST|GROIN|ARMS - slowdown = 0 + slowdown = 1 armor_type = /datum/armor/ce_tailcoat flags_inv = null clothing_flags = null @@ -378,3 +378,8 @@ name = "centcom tailcoat" desc = "A reinforced tailcoat worn by bunny themed centcom officers." icon_state = "tailcoat_centcom" + +/obj/item/clothing/suit/armor/security_tailcoat/syndi + name = "syndie's tailcoat" + desc = "A reinforced tailcoat worn by illegal bunnies. Stylishly holds hidden flak plates." + icon_state = "tailcoat_syndi" diff --git a/tff_modular/modules/bunny/code/clothing/under.dm b/tff_modular/modules/bunny/code/clothing/under.dm index ff3c00b3110..6a5d16fce71 100644 --- a/tff_modular/modules/bunny/code/clothing/under.dm +++ b/tff_modular/modules/bunny/code/clothing/under.dm @@ -9,10 +9,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/costume/playbunny/Initialize(mapload) - . = ..() - create_storage(storage_type = /datum/storage/pockets/tiny) - /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?" @@ -22,10 +18,6 @@ icon_state = "syndibunny" body_parts_covered = CHEST|GROIN|LEGS -/obj/item/clothing/under/syndicate/syndibunny/Initialize(mapload) - . = ..() - create_storage(storage_type = /datum/storage/pockets/small) - /obj/item/clothing/under/syndicate/syndibunny/fake armor_type = /datum/armor/clothing_under/none @@ -78,11 +70,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/captain/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - //CARGO /obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit @@ -95,11 +82,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/cargo/quartermaster_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/cargo/cargo_bunnysuit name = "cargo bunny suit" desc = "The staple of any bunny themed cargo technicians. Nigh indistinguishable from the quartermasters bunny suit." @@ -110,11 +92,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/cargo/cargo_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/cargo/miner/bunnysuit name = "shaft miner's bunny suit" desc = "The staple of any bunny themed shaft miners. The perfect outfit for fighting demons on an ash choked hell planet." @@ -125,11 +102,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/cargo/miner/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/cargo/mailman_bunnysuit name = "mailman's bunny suit" desc = "The staple of any bunny themed mailmen. A sleek mailman outfit for when you need to deliver mail as quickly and with as little wind resistance possible." @@ -140,11 +112,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/cargo/mailman_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/cargo/bitrunner/bunnysuit name = "bunrunner suit" desc = "The staple of any bunny themed gamer. Has enough space for one extra soda, if you're worthy." @@ -170,11 +137,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/engineering/engineer_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/engineering/atmos_tech_bunnysuit name = "atmospheric technician's bunny suit" desc = "The staple of any bunny themed atmospheric technicians. Perfect for any blue collar worker wanting to keep up with fashion trends." @@ -185,11 +147,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/engineering/atmos_tech_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit name = "chief engineer's bunny suit" desc = "The staple of any bunny themed chief engineers. The airy design helps with keeping cool when engine fires get too hot to handle." @@ -200,11 +157,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - //MEDICAL /obj/item/clothing/under/rank/medical/doctor_bunnysuit @@ -216,11 +168,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/medical/doctor_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/medical/paramedic_bunnysuit desc = "The staple of any bunny themed paramedics. Comes with spare pockets for medical supplies fastened to the leggings." name = "paramedic's bunnysuit" @@ -230,11 +177,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/medical/paramedic_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/medical/chemist/bunnysuit desc = "The staple of any bunny themed chemists. The stockings are both airy and acid resistant." name = "chemist's bunnysuit" @@ -244,11 +186,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/medical/chemist/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/medical/pathologist_bunnysuit desc = "The staple of any bunny themed pathologists. The stockings, while cute, do nothing to combat pathogens." name = "pathologist's bunnysuit" @@ -258,11 +195,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/medical/pathologist_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/medical/coroner_bunnysuit desc = "The staple of any bunny themed coroners. A rejected mime costume." name = "coroner's bunnysuit" @@ -272,11 +204,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/medical/coroner_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/medical/cmo_bunnysuit desc = "The staple of any bunny themed chief medical officers. The more vibrant blue accents denote a higher status." name = "chief medical officer's bunnysuit" @@ -286,11 +213,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/medical/cmo_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - //SCIENCE /obj/item/clothing/under/rank/rnd/scientist/bunnysuit @@ -302,10 +224,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/rnd/scientist/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) /obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit desc = "The staple of any bunny themed roboticists. The open design and thin leggings help to keep cool when piloting mechs." @@ -316,11 +234,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/rnd/geneticist/bunnysuit desc = "The staple of any bunny themed geneticists. Doesn’t go great with an abominable green muscled physique, but then again, what does?" name = "geneticist's bunnysuit" @@ -330,11 +243,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/rnd/geneticist/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/rnd/research_director/bunnysuit desc = "The staple of any bunny themed head researchers. Advanced technology allows this suit to stimulate spontaneous bunny tail growth when worn, though it's nigh-indistinguishable from the standard cottonball and disappears as soon as the suit is removed." name = "research director's bunnysuit" @@ -345,11 +253,6 @@ can_adjust = TRUE alt_covers_chest = TRUE -/obj/item/clothing/under/rank/rnd/research_director/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - //SECURITY /obj/item/clothing/under/rank/security/security_bunnysuit @@ -361,11 +264,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/security/security_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/security/security_assistant_bunnysuit desc = "The staple of any bunny themed security assistants. Can't lost respect you don't have!" name = "security assistant's bunnysuit" @@ -375,11 +273,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/security/security_assistant_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/security/warden_bunnysuit desc = "The staple of any bunny themed wardens. The more formal security bunny suit for a less combat focused job." name = "warden's bunnysuit" @@ -389,11 +282,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/security/warden_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/security/brig_phys_bunnysuit desc = "The staple of any bunny themed brig physicians. The rejected alternative to an already discontinued alternate uniform, now sold at a premium!" name = "brig physician's bunnysuit" @@ -402,12 +290,6 @@ icon = 'tff_modular/modules/bunny/icons/obj/under.dmi' body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE - -/obj/item/clothing/under/rank/security/brig_phys_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/security/detective_bunnysuit desc = "The staple of any bunny themed detectives. Capable of storing precious candy corns." name = "detective's bunnysuit" @@ -417,11 +299,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/security/detective_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/security/detective_bunnysuit/noir desc = "The staple of any noir bunny themed detectives. Capable of storing precious candy corns." name = "noir detective's bunnysuit" @@ -431,11 +308,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/security/detective_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/security/prisoner_bunnysuit desc = "The staple of any bunny themed prisoners. Great for hiding shanks and other small contrabands." name = "prisoner's bunnysuit" @@ -445,11 +317,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/security/prisoner_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/security/head_of_security/bunnysuit desc = "The staple of any bunny themed security commanders. Includes kevlar weave stockings and a gilded tail." name = "Head of Security's bunnysuit" @@ -459,11 +326,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/security/head_of_security/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - //SERVICE /obj/item/clothing/under/rank/civilian/hop_bunnysuit @@ -476,11 +338,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/hop_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/janitor/bunnysuit name = "janitor's bunny suit" desc = "The staple of any bunny themed janitors. The stockings are made of cotton to allow for easy laundering." @@ -491,11 +348,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/janitor/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/bartender_bunnysuit name = "bartender's bunnysuit" desc = "The staple of any bunny themed bartenders. Looks even more stylish than the standard bunny suit." @@ -507,11 +359,6 @@ alt_covers_chest = TRUE custom_price = PAYCHECK_CREW -/obj/item/clothing/under/rank/civilian/bartender_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/cook_bunnysuit name = "cook's bunny suit" desc = "The staple of any bunny themed chefs. Shame there aren't any fishnets." @@ -522,11 +369,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/cook_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/hydroponics/bunnysuit name = "botanist's bunny suit" desc = "The staple of any bunny themed botanists. The stockings are made of faux-denim to mimic the look of overalls." @@ -537,11 +379,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/hydroponics/bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/clown/clown_bunnysuit name = "clown's bunny suit" desc = "The staple of any bunny themed clowns. Now this is just ridiculous." @@ -552,11 +389,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/clown/clown_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/mime_bunnysuit name = "mime's bunny suit" desc = "The staple of any bunny themed mimes. Includes black and white stockings in order to comply with mime federation outfit regulations." @@ -567,11 +399,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/mime_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/chaplain_bunnysuit name = "chaplain's bunny suit" desc = "The staple of any bunny themed chaplains. The wool for the stockings came from a sacrificial lamb, making them extra holy." @@ -582,11 +409,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/chaplain_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/curator_bunnysuit_red name = "curator's red bunny suit" desc = "The staple of any bunny themed librarians. A professional yet comfortable suit perfect for the aspiring bunny academic." @@ -597,11 +419,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/curator_bunnysuit_red/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/curator_bunnysuit_green name = "curator's green bunny suit" desc = "The staple of any bunny themed librarians. A professional yet comfortable suit perfect for the aspiring bunny academic." @@ -612,11 +429,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/curator_bunnysuit_green/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/curator_bunnysuit_teal name = "curator's teal bunny suit" desc = "The staple of any bunny themed librarians. A professional yet comfortable suit perfect for the aspiring bunny academic." @@ -627,11 +439,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/curator_bunnysuit_teal/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_black name = "lawyer's black bunny suit" desc = "A black linen coat worn by bunny themed lawyers. May or may not contain souls of the damned in suit pockets." @@ -642,11 +449,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_black/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_blue name = "lawyer's blue bunny suit" desc = "The staple of any bunny themed lawyers. EXTREMELY professional." @@ -657,11 +459,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_blue/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_red name = "lawyer's red bunny suit" desc = "The staple of any bunny themed lawyers. EXTREMELY professional." @@ -672,11 +469,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_red/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) - /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_good name = "good lawyer's bunny suit" desc = "The staple of any bunny themed lawyers. EXTREMELY professional." @@ -687,10 +479,6 @@ body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE -/obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_good/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) /obj/item/clothing/under/rank/civilian/psychologist_bunnysuit name = "psychologist's bunny suit" @@ -701,8 +489,3 @@ icon = 'tff_modular/modules/bunny/icons/obj/under.dmi' body_parts_covered = CHEST|GROIN|LEGS alt_covers_chest = TRUE - -/obj/item/clothing/under/rank/civilian/psychologist_bunnysuit/Initialize(mapload) - . = ..() - - create_storage(storage_type = /datum/storage/pockets/tiny) diff --git a/tff_modular/modules/vending/vends/autodrobe.dm b/tff_modular/modules/vending/vends/autodrobe.dm index be943d30bc8..420a0cdf2f9 100644 --- a/tff_modular/modules/vending/vends/autodrobe.dm +++ b/tff_modular/modules/vending/vends/autodrobe.dm @@ -1,5 +1,9 @@ /obj/machinery/vending/autodrobe - contraband_ff = list( + product_categories = list( + list( + "name" = "Other", + "icon" = "star", + "products" = list( /obj/item/clothing/under/rank/civilian/clown/clown_bunnysuit = 3, /obj/item/clothing/under/rank/civilian/mime_bunnysuit = 3, /obj/item/clothing/suit/jacket/tailcoat/clown = 3, @@ -9,4 +13,6 @@ /obj/item/clothing/head/playbunnyears/mime = 3, /obj/item/clothing/shoes/clown_shoes/heeled = 3, /obj/item/clothing/shoes/fancy_heels/white = 3, + ), + ), ) diff --git a/tff_modular/modules/vending/vends/clothing.dm b/tff_modular/modules/vending/vends/clothing.dm index 8c63b070afb..c4fb7753832 100644 --- a/tff_modular/modules/vending/vends/clothing.dm +++ b/tff_modular/modules/vending/vends/clothing.dm @@ -1,40 +1,46 @@ /obj/machinery/vending/clothing - contraband_ff = list( - /obj/item/clothing/neck/bunny/bunnytie = 3, - /obj/item/clothing/under/costume/playbunny = 3, - /obj/item/clothing/under/costume/playbunny/british = 3, - /obj/item/clothing/under/costume/playbunny/communist = 3, - /obj/item/clothing/under/costume/playbunny/usa = 3, - /obj/item/clothing/suit/jacket/tailcoat = 3, - /obj/item/clothing/neck/bunny/bunnytie = 3, - /obj/item/clothing/neck/bunny/bunnytie/communist = 3, - /obj/item/clothing/neck/bunny/bunnytie/blue = 3, - /obj/item/clothing/head/playbunnyears = 3, - /obj/item/clothing/head/playbunnyears/british = 3, - /obj/item/clothing/head/playbunnyears/communist = 3, - /obj/item/clothing/head/playbunnyears/usa = 3, - /obj/item/clothing/shoes/fancy_heels/cc = 3, - /obj/item/clothing/shoes/fancy_heels/red = 3, - /obj/item/clothing/shoes/fancy_heels/blue = 3, - /obj/item/clothing/shoes/fancy_heels/lightgrey = 3, - /obj/item/clothing/shoes/fancy_heels/navyblue = 3, - /obj/item/clothing/shoes/fancy_heels/white = 3, - /obj/item/clothing/shoes/fancy_heels/darkblue = 3, - /obj/item/clothing/shoes/fancy_heels/black = 3, - /obj/item/clothing/shoes/fancy_heels/purple = 3, - /obj/item/clothing/shoes/fancy_heels/red = 3, - /obj/item/clothing/shoes/fancy_heels/grey = 3, - /obj/item/clothing/shoes/fancy_heels/brown = 3, - /obj/item/clothing/shoes/fancy_heels/orange = 3, - /obj/item/clothing/shoes/jackboots/gogo_boots = 3, - /obj/item/clothing/shoes/fancy_heels/lightblue = 3, - /obj/item/clothing/shoes/galoshes/heeled = 3, - /obj/item/clothing/shoes/fancy_heels/green = 3, - /obj/item/clothing/shoes/clown_shoes/heeled = 3, - /obj/item/clothing/shoes/fancy_heels/darkgreen = 3, - /obj/item/clothing/shoes/fancy_heels/teal = 3, - /obj/item/clothing/shoes/fancy_heels/mutedblack = 3, - /obj/item/clothing/shoes/fancy_heels/mutedblue = 3, - /obj/item/clothing/shoes/fancy_heels/beige = 3, - /obj/item/clothing/shoes/fancy_heels/darkgrey = 3, + product_categories = list( + list( + "name" = "Special", + "icon" = "star", + "products" = list( + /obj/item/clothing/neck/bunny/bunnytie = 3, + /obj/item/clothing/under/costume/playbunny = 3, + /obj/item/clothing/under/costume/playbunny/british = 3, + /obj/item/clothing/under/costume/playbunny/communist = 3, + /obj/item/clothing/under/costume/playbunny/usa = 3, + /obj/item/clothing/suit/jacket/tailcoat = 3, + /obj/item/clothing/neck/bunny/bunnytie = 3, + /obj/item/clothing/neck/bunny/bunnytie/communist = 3, + /obj/item/clothing/neck/bunny/bunnytie/blue = 3, + /obj/item/clothing/head/playbunnyears = 3, + /obj/item/clothing/head/playbunnyears/british = 3, + /obj/item/clothing/head/playbunnyears/communist = 3, + /obj/item/clothing/head/playbunnyears/usa = 3, + /obj/item/clothing/shoes/fancy_heels/cc = 3, + /obj/item/clothing/shoes/fancy_heels/red = 3, + /obj/item/clothing/shoes/fancy_heels/blue = 3, + /obj/item/clothing/shoes/fancy_heels/lightgrey = 3, + /obj/item/clothing/shoes/fancy_heels/navyblue = 3, + /obj/item/clothing/shoes/fancy_heels/white = 3, + /obj/item/clothing/shoes/fancy_heels/darkblue = 3, + /obj/item/clothing/shoes/fancy_heels/black = 3, + /obj/item/clothing/shoes/fancy_heels/purple = 3, + /obj/item/clothing/shoes/fancy_heels/red = 3, + /obj/item/clothing/shoes/fancy_heels/grey = 3, + /obj/item/clothing/shoes/fancy_heels/brown = 3, + /obj/item/clothing/shoes/fancy_heels/orange = 3, + /obj/item/clothing/shoes/jackboots/gogo_boots = 3, + /obj/item/clothing/shoes/fancy_heels/lightblue = 3, + /obj/item/clothing/shoes/galoshes/heeled = 3, + /obj/item/clothing/shoes/fancy_heels/green = 3, + /obj/item/clothing/shoes/clown_shoes/heeled = 3, + /obj/item/clothing/shoes/fancy_heels/darkgreen = 3, + /obj/item/clothing/shoes/fancy_heels/teal = 3, + /obj/item/clothing/shoes/fancy_heels/mutedblack = 3, + /obj/item/clothing/shoes/fancy_heels/mutedblue = 3, + /obj/item/clothing/shoes/fancy_heels/beige = 3, + /obj/item/clothing/shoes/fancy_heels/darkgrey = 3, + ), + ), ) diff --git a/tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm new file mode 100644 index 00000000000..c443e952683 --- /dev/null +++ b/tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm @@ -0,0 +1,10 @@ +// All ghost roles and antagonists wardrobes + +/obj/machinery/vending/wardrobe/cent_wardrobe + products_ff = list( + /obj/item/clothing/under/costume/playbunny/centcom = 3, + /obj/item/clothing/suit/armor/security_tailcoat/centcom = 3, + /obj/item/clothing/neck/bunny/bunnytie/centcom = 3, + /obj/item/clothing/head/playbunnyears/centcom = 3, + /obj/item/clothing/shoes/fancy_heels/darkgreen = 3, + ) diff --git a/tff_modular/modules/vending/vends/wardrobe/magivend.dm b/tff_modular/modules/vending/vends/wardrobe/magivend.dm new file mode 100644 index 00000000000..d5a7b759455 --- /dev/null +++ b/tff_modular/modules/vending/vends/wardrobe/magivend.dm @@ -0,0 +1,7 @@ +/obj/machinery/vending/magivend + products_ff = list( + /obj/item/clothing/under/costume/playbunny/magician = 1, + /obj/item/clothing/suit/wizrobe/magician = 1, + /obj/item/clothing/neck/bunny/bunnytie/magician = 1, + /obj/item/clothing/shoes/fancy_heels/wizard = 1, + ) diff --git a/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm index fa9c0e6006a..5d89e639d0b 100644 --- a/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm @@ -1,25 +1,31 @@ /obj/machinery/vending/wardrobe/sec_wardrobe - products_ff = list( - /obj/item/clothing/under/rank/security/security_bunnysuit = 3, - /obj/item/clothing/under/rank/security/security_assistant_bunnysuit = 3, - /obj/item/clothing/under/rank/security/warden_bunnysuit = 3, - /obj/item/clothing/under/rank/security/brig_phys_bunnysuit = 3, - /obj/item/clothing/under/rank/security/prisoner_bunnysuit = 3, - /obj/item/clothing/suit/armor/security_tailcoat = 3, - /obj/item/clothing/suit/armor/security_tailcoat/assistant = 3, - /obj/item/clothing/suit/armor/security_tailcoat/warden = 3, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec = 3, - /obj/item/clothing/neck/bunny/bunnytie/security = 3, - /obj/item/clothing/neck/bunny/bunnytie/security_assistant = 3, - /obj/item/clothing/neck/bunny/bunnytie/brig_phys = 3, - /obj/item/clothing/neck/bunny/bunnytie/prisoner = 3, - /obj/item/clothing/head/playbunnyears/security = 3, - /obj/item/clothing/head/playbunnyears/security/assistant = 3, - /obj/item/clothing/head/playbunnyears/warden = 3, - /obj/item/clothing/head/playbunnyears/brig_phys = 3, - /obj/item/clothing/head/playbunnyears/prisoner = 3, - /obj/item/clothing/shoes/fancy_heels/red = 3, - /obj/item/clothing/shoes/fancy_heels/blue = 3, - /obj/item/clothing/shoes/fancy_heels/black = 3, - /obj/item/clothing/shoes/fancy_heels/orange = 3, - ) + product_categories_ff = list( + list( + "name" = "Bunny", + "icon" = "star", + "products" = list( + /obj/item/clothing/under/rank/security/security_bunnysuit = 3, + /obj/item/clothing/under/rank/security/security_assistant_bunnysuit = 3, + /obj/item/clothing/under/rank/security/warden_bunnysuit = 3, + /obj/item/clothing/under/rank/security/brig_phys_bunnysuit = 3, + /obj/item/clothing/under/rank/security/prisoner_bunnysuit = 3, + /obj/item/clothing/suit/armor/security_tailcoat = 3, + /obj/item/clothing/suit/armor/security_tailcoat/assistant = 3, + /obj/item/clothing/suit/armor/security_tailcoat/warden = 3, + /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec = 3, + /obj/item/clothing/neck/bunny/bunnytie/security = 3, + /obj/item/clothing/neck/bunny/bunnytie/security_assistant = 3, + /obj/item/clothing/neck/bunny/bunnytie/brig_phys = 3, + /obj/item/clothing/neck/bunny/bunnytie/prisoner = 3, + /obj/item/clothing/head/playbunnyears/security = 3, + /obj/item/clothing/head/playbunnyears/security/assistant = 3, + /obj/item/clothing/head/playbunnyears/warden = 3, + /obj/item/clothing/head/playbunnyears/brig_phys = 3, + /obj/item/clothing/head/playbunnyears/prisoner = 3, + /obj/item/clothing/shoes/fancy_heels/red = 3, + /obj/item/clothing/shoes/fancy_heels/blue = 3, + /obj/item/clothing/shoes/fancy_heels/black = 3, + /obj/item/clothing/shoes/fancy_heels/orange = 3, + ), + ), + ) diff --git a/tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm new file mode 100644 index 00000000000..907ed3e2435 --- /dev/null +++ b/tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm @@ -0,0 +1,8 @@ +/obj/machinery/vending/wardrobe/syndie_wardrobe + products_ff = list( + /obj/item/clothing/under/syndicate/syndibunny = 3, + /obj/item/clothing/suit/armor/security_tailcoat/syndi = 3, + /obj/item/clothing/neck/bunny/bunnytie/syndicate = 3, + /obj/item/clothing/head/playbunnyears/syndicate = 3, + /obj/item/clothing/shoes/fancy_heels/syndi = 3, + ) diff --git a/tgstation.dme b/tgstation.dme index 413949b9f50..2bc500757d2 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8813,6 +8813,7 @@ #include "tff_modular\modules\vending\vends\wardrobe\atmos_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\bar_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\cargo_wardrobe.dm" +#include "tff_modular\modules\vending\vends\wardrobe\cent_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\chap_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\chef_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\chem_wardrobe.dm" @@ -8823,10 +8824,12 @@ #include "tff_modular\modules\vending\vends\wardrobe\hydro_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\jani_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\law_wardrobe.dm" +#include "tff_modular\modules\vending\vends\wardrobe\magivend.dm" #include "tff_modular\modules\vending\vends\wardrobe\medi_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\robo_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\science_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\sec_wardrobe.dm" +#include "tff_modular\modules\vending\vends\wardrobe\syndie_wardrobe.dm" #include "tff_modular\modules\vending\vends\wardrobe\viro_wardrobe.dm" #include "tff_modular\modules\vulpkanin_accessories\code\ears.dm" #include "tff_modular\modules\vulpkanin_accessories\code\hair.dm"