From fc48c5f0ae4f7d9a49ff57d426205d62fee039b2 Mon Sep 17 00:00:00 2001 From: Feenie Date: Sat, 22 Feb 2025 11:52:50 +0300 Subject: [PATCH] Moved bunny to contrabunny --- .../vending/vends/wardrobe/atmos_wardrobe.dm | 2 +- .../vending/vends/wardrobe/bar_wardrobe.dm | 2 +- .../vending/vends/wardrobe/cargo_wardrobe.dm | 2 +- .../vending/vends/wardrobe/cent_wardrobe.dm | 2 +- .../vending/vends/wardrobe/chap_wardrobe.dm | 2 +- .../vending/vends/wardrobe/chef_wardrobe.dm | 2 +- .../vending/vends/wardrobe/chem_wardrobe.dm | 2 +- .../vends/wardrobe/coroner_wardrobe.dm | 2 +- .../vends/wardrobe/curator_wardrobe.dm | 2 +- .../vending/vends/wardrobe/det_wardrobe.dm | 2 +- .../vending/vends/wardrobe/engi_wardrobe.dm | 2 +- .../vending/vends/wardrobe/hydro_wardrobe.dm | 2 +- .../vending/vends/wardrobe/jani_wardrobe.dm | 2 +- .../vending/vends/wardrobe/law_wardrobe.dm | 2 +- .../vending/vends/wardrobe/medi_wardrobe.dm | 2 +- .../vending/vends/wardrobe/robo_wardrobe.dm | 2 +- .../vends/wardrobe/science_wardrobe.dm | 2 +- .../vending/vends/wardrobe/sec_wardrobe.dm | 52 ++++++++----------- .../vending/vends/wardrobe/syndie_wardrobe.dm | 2 +- .../vending/vends/wardrobe/viro_wardrobe.dm | 2 +- 20 files changed, 42 insertions(+), 48 deletions(-) diff --git a/tff_modular/modules/vending/vends/wardrobe/atmos_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/atmos_wardrobe.dm index 4e2859115db..928f99c72a9 100644 --- a/tff_modular/modules/vending/vends/wardrobe/atmos_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/atmos_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/atmos_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/engineering/atmos_tech_bunnysuit = 3, /obj/item/clothing/suit/utility/fire/atmos_tech_tailcoat = 3, /obj/item/clothing/neck/bunny/bunnytie/atmos_tech = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/bar_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/bar_wardrobe.dm index cd0b81b926b..2722357079e 100644 --- a/tff_modular/modules/vending/vends/wardrobe/bar_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/bar_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/bar_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/storage/backpack/waistbag/srv = 3, /obj/item/clothing/under/rank/civilian/bartender_bunnysuit = 3, /obj/item/clothing/neck/bunny/bunnytie/bartender = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/cargo_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/cargo_wardrobe.dm index b71c1f4d7cd..40714156447 100644 --- a/tff_modular/modules/vending/vends/wardrobe/cargo_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/cargo_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/cargo_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/storage/backpack/waistbag/cargo = 3, /obj/item/clothing/under/rank/cargo/cargo_bunnysuit = 3, /obj/item/clothing/under/rank/cargo/miner/bunnysuit = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm index c443e952683..72f7aa8a498 100644 --- a/tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/cent_wardrobe.dm @@ -1,7 +1,7 @@ // All ghost roles and antagonists wardrobes /obj/machinery/vending/wardrobe/cent_wardrobe - products_ff = list( + contraband_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, diff --git a/tff_modular/modules/vending/vends/wardrobe/chap_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/chap_wardrobe.dm index 0cec8ebded8..841961960be 100644 --- a/tff_modular/modules/vending/vends/wardrobe/chap_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/chap_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/chap_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/civilian/chaplain_bunnysuit = 3, /obj/item/clothing/suit/jacket/tailcoat/chaplain = 3, /obj/item/clothing/neck/bunny_pendant = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/chef_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/chef_wardrobe.dm index a54787e43bd..2c21ee8fb8d 100644 --- a/tff_modular/modules/vending/vends/wardrobe/chef_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/chef_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/chef_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/civilian/cook_bunnysuit = 3, /obj/item/clothing/suit/jacket/tailcoat/cook = 3, /obj/item/clothing/neck/bunny/bunnytie/cook = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/chem_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/chem_wardrobe.dm index 803027dad5a..97ac6ada50e 100644 --- a/tff_modular/modules/vending/vends/wardrobe/chem_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/chem_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/chem_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/medical/chemist/bunnysuit = 3, /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/chemist = 3, /obj/item/clothing/neck/bunny/bunnytie/chemist = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/coroner_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/coroner_wardrobe.dm index 087c6c54789..1223a7718aa 100644 --- a/tff_modular/modules/vending/vends/wardrobe/coroner_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/coroner_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/coroner_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/medical/coroner_bunnysuit = 3, /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/coroner = 3, /obj/item/clothing/neck/bunny/bunnytie/coroner = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/curator_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/curator_wardrobe.dm index 300dc665368..18021d6dbe1 100644 --- a/tff_modular/modules/vending/vends/wardrobe/curator_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/curator_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/curator_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/civilian/curator_bunnysuit_red = 3, /obj/item/clothing/under/rank/civilian/curator_bunnysuit_green = 3, /obj/item/clothing/under/rank/civilian/curator_bunnysuit_teal = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/det_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/det_wardrobe.dm index 919b4e5b5ed..153b18c778f 100644 --- a/tff_modular/modules/vending/vends/wardrobe/det_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/det_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/det_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/security/detective_bunnysuit = 3, /obj/item/clothing/under/rank/security/detective_bunnysuit/noir = 3, /obj/item/clothing/suit/jacket/det_suit/tailcoat = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/engi_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/engi_wardrobe.dm index c3114876943..497d1bbbdb8 100644 --- a/tff_modular/modules/vending/vends/wardrobe/engi_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/engi_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/engi_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/storage/backpack/waistbag/eng = 3, /obj/item/clothing/under/rank/engineering/engineer_bunnysuit = 3, /obj/item/clothing/suit/jacket/tailcoat/engineer = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/hydro_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/hydro_wardrobe.dm index cbc96aef071..4e949e9ef66 100644 --- a/tff_modular/modules/vending/vends/wardrobe/hydro_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/hydro_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/hydro_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/storage/backpack/waistbag/srv = 3, /obj/item/clothing/under/rank/civilian/hydroponics/bunnysuit = 3, /obj/item/clothing/suit/jacket/tailcoat/botanist = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/jani_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/jani_wardrobe.dm index 189dc763c86..346cb8e5fc8 100644 --- a/tff_modular/modules/vending/vends/wardrobe/jani_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/jani_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/jani_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/storage/backpack/waistbag/srv = 3, /obj/item/clothing/under/rank/civilian/janitor/bunnysuit = 3, /obj/item/clothing/suit/jacket/tailcoat/janitor = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/law_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/law_wardrobe.dm index b53c3937676..58fe214524b 100644 --- a/tff_modular/modules/vending/vends/wardrobe/law_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/law_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/law_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_black = 3, /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_blue = 3, /obj/item/clothing/under/rank/civilian/lawyer_bunnysuit_red = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/medi_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/medi_wardrobe.dm index 5f22831a0a5..ded1cd4c0f2 100644 --- a/tff_modular/modules/vending/vends/wardrobe/medi_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/medi_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/medi_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/storage/backpack/waistbag/med = 3, /obj/item/clothing/under/rank/medical/doctor_bunnysuit = 3, /obj/item/clothing/under/rank/medical/paramedic_bunnysuit = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/robo_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/robo_wardrobe.dm index 95da0f46f48..4913cb80b39 100644 --- a/tff_modular/modules/vending/vends/wardrobe/robo_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/robo_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/robo_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit = 3, /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/robotics = 3, /obj/item/clothing/neck/bunny/bunnytie/roboticist = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/science_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/science_wardrobe.dm index 2f8629b86ac..db52026d0cb 100644 --- a/tff_modular/modules/vending/vends/wardrobe/science_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/science_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/science_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/storage/backpack/waistbag/sci = 3, /obj/item/clothing/under/rank/rnd/scientist/bunnysuit = 3, /obj/item/clothing/under/rank/rnd/geneticist/bunnysuit = 3, diff --git a/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm index 5d89e639d0b..4488ec638ce 100644 --- a/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/sec_wardrobe.dm @@ -1,31 +1,25 @@ /obj/machinery/vending/wardrobe/sec_wardrobe - 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, - ), - ), + contraband_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, ) diff --git a/tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm index 907ed3e2435..9b349e0db48 100644 --- a/tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/syndie_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/syndie_wardrobe - products_ff = list( + contraband_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, diff --git a/tff_modular/modules/vending/vends/wardrobe/viro_wardrobe.dm b/tff_modular/modules/vending/vends/wardrobe/viro_wardrobe.dm index 6da3729a21e..13194db2d22 100644 --- a/tff_modular/modules/vending/vends/wardrobe/viro_wardrobe.dm +++ b/tff_modular/modules/vending/vends/wardrobe/viro_wardrobe.dm @@ -1,5 +1,5 @@ /obj/machinery/vending/wardrobe/viro_wardrobe - products_ff = list( + contraband_ff = list( /obj/item/clothing/under/rank/medical/pathologist_bunnysuit = 3, /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/pathologist = 3, /obj/item/clothing/neck/bunny/bunnytie/pathologist = 3,