demodularise vending files

code/modules/vending/megaseed.dm

@@ -14,6 +14,7 @@
 					/obj/item/seeds/cherry = 3,
 					/obj/item/seeds/chanter = 3,
 					/obj/item/seeds/chili = 3,
+					/obj/item/seeds/cinnamomum = 3,
 					/obj/item/seeds/cocoapod = 3,
 					/obj/item/seeds/coffee = 3,
 					/obj/item/seeds/corn = 3,
@@ -49,8 +50,10 @@
 					  /obj/item/seeds/reishi = 2,
 					  /obj/item/seeds/cannabis = 3,
 					  /obj/item/seeds/starthistle = 2,
-					  /obj/item/seeds/random = 3)//yogs -- reverted to three instead of /tg/'s two
+					  /obj/item/seeds/random = 3)
 	premium = list(/obj/item/reagent_containers/spray/waterflower = 1)
+	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	resistance_flags = FIRE_PROOF
 	refill_canister = /obj/item/vending_refill/hydroseeds
 	default_price = 10
 	extra_price = 50

code/modules/vending/security.dm

@@ -17,8 +17,10 @@
 					  /obj/item/storage/fancy/donut_box = 2)
 	premium = list(/obj/item/storage/belt/security/webbing = 5,
 				   /obj/item/coin/antagtoken = 1,
-				   /obj/item/clothing/head/helmet/blueshirt = 1,
-				   /obj/item/clothing/suit/armor/vest/blueshirt = 1)
+				   /obj/item/clothing/head/helmet/warhelmet = 5,
+				   /obj/item/clothing/suit/armor/vest/rycliesarmour = 5,
+				   /obj/item/clothing/head/helmet/blueshirt = 5,
+				   /obj/item/clothing/suit/armor/vest/blueshirt = 5)
 	refill_canister = /obj/item/vending_refill/security
 	default_price = 100
 	extra_price = 150

code/modules/vending/wardrobes.dm

@@ -21,12 +21,24 @@
 					/obj/item/storage/backpack/satchel/sec = 3,
 					/obj/item/storage/backpack/duffelbag/sec = 3,
 					/obj/item/clothing/under/rank/security = 3,
+					/obj/item/clothing/under/yogs/armyuniform = 3,
 					/obj/item/clothing/shoes/jackboots = 3,
 					/obj/item/clothing/head/beret/sec = 3,
+					/obj/item/clothing/head/beret/corpsec = 3,
 					/obj/item/clothing/head/soft/sec = 3,
 					/obj/item/clothing/mask/bandana/red = 3,
+					/obj/item/clothing/suit/armor/vest/secmiljacket = 3,
+					/obj/item/clothing/shoes/yogs/namboots = 5,
+					/obj/item/clothing/gloves/yogs/namgloves = 5,
+					/obj/item/clothing/under/yogs/namjumpsuit = 5,
+					/obj/item/clothing/suit/armor/vest/namflakjacket = 5,
+					/obj/item/clothing/head/helmet/namhelm = 5,
+					/obj/item/clothing/under/yogs/redcoatuniform = 5,
+					/obj/item/clothing/suit/armor/vest/redcoatcoat = 5,
+					/obj/item/clothing/head/yogs/tricornhat = 5,
 					/obj/item/clothing/under/rank/security/skirt = 3,
 					/obj/item/clothing/under/rank/security/grey = 3,
+					/obj/item/clothing/under/yogs/shitcurity = 3,
 					/obj/item/clothing/under/pants/khaki = 3,
 					/obj/item/clothing/under/rank/security/blueshirt = 3)
 	premium = list(/obj/item/clothing/under/rank/security/navyblue = 3,
@@ -48,9 +60,11 @@
 					/obj/item/storage/backpack/duffelbag/med = 4,
 					/obj/item/storage/backpack/medic = 4,
 					/obj/item/storage/backpack/satchel/med = 4,
+					/obj/item/clothing/head/beret/med = 4,
 					/obj/item/clothing/suit/hooded/wintercoat/medical = 4,
 					/obj/item/clothing/under/rank/nursesuit = 4,
 					/obj/item/clothing/head/nursehat = 4,
+					/obj/item/clothing/under/yogs/nursedress = 4,
 					/obj/item/clothing/under/rank/medical/skirt= 4,
 					/obj/item/clothing/under/rank/medical/blue = 4,
 					/obj/item/clothing/under/rank/medical/green = 4,
@@ -83,8 +97,12 @@
 					/obj/item/clothing/under/rank/engineer/hazard = 3,
 					/obj/item/clothing/suit/hazardvest = 3,
 					/obj/item/clothing/shoes/workboots = 3,
+					/obj/item/clothing/head/beret/eng = 3,
 					/obj/item/clothing/head/hardhat = 3,
-					/obj/item/clothing/head/hardhat/weldhat = 3)
+					/obj/item/clothing/head/welding/demon = 1,
+					/obj/item/clothing/head/welding/knight = 1,
+					/obj/item/clothing/head/welding/engie = 1,
+					/obj/item/clothing/head/hardhat/weldhat = 1)
 	refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe
 	payment_department = ACCOUNT_ENG
 /obj/item/vending_refill/wardrobe/engi_wardrobe
@@ -101,6 +119,7 @@
 					/obj/item/storage/backpack/satchel/eng = 2,
 					/obj/item/storage/backpack/industrial = 2,
 					/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3,
+					/obj/item/clothing/head/beret/atmos = 3,
 					/obj/item/clothing/under/rank/atmospheric_technician = 3,
 					/obj/item/clothing/under/rank/atmospheric_technician/skirt = 3,
 					/obj/item/clothing/shoes/sneakers/black = 3)
@@ -153,9 +172,14 @@
 	product_ads = "You turn me TRUE, use defines!;0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101"
 	vend_reply = "Thank you for using the RoboDrobe!"
 	products = list(/obj/item/clothing/glasses/hud/diagnostic = 2,
+					/obj/item/clothing/head/welding/carp = 1,
+					/obj/item/clothing/head/welding/fancy = 1,
+					/obj/item/clothing/head/welding/demon = 1,
 					/obj/item/clothing/under/rank/roboticist = 2,
 					/obj/item/clothing/under/rank/roboticist/skirt = 2,
 					/obj/item/clothing/suit/toggle/labcoat = 2,
+					/obj/item/clothing/suit/toggle/labcoat/wardtlab = 2,
+					/obj/item/clothing/suit/toggle/labcoat/aeneasrinil = 2,
 					/obj/item/clothing/shoes/sneakers/black = 2,
 					/obj/item/clothing/gloves/fingerless = 2,
 					/obj/item/clothing/head/soft/black = 2,
@@ -174,6 +198,7 @@
 	products = list(/obj/item/clothing/accessory/pocketprotector = 3,
 					/obj/item/storage/backpack/science = 3,
 					/obj/item/storage/backpack/satchel/tox = 3,
+					/obj/item/clothing/head/beret/sci = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/science = 3,
 					/obj/item/clothing/under/rank/scientist = 3,
 					/obj/item/clothing/under/rank/scientist/skirt = 3,
@@ -197,6 +222,7 @@
 					/obj/item/clothing/suit/hooded/wintercoat/hydro = 2,
 					/obj/item/clothing/suit/apron = 2,
 					/obj/item/clothing/suit/apron/overalls = 3,
+					/obj/item/clothing/under/yogs/botanyuniform = 3,
 					/obj/item/clothing/under/rank/hydroponics = 3,
 					/obj/item/clothing/under/rank/hydroponics/skirt = 3,
 					/obj/item/clothing/mask/bandana = 3,
@@ -222,6 +248,8 @@
 					/obj/item/clothing/under/gimmick/rank/captain/suit/skirt = 2,
 					/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt = 2,
 					/obj/item/storage/backpack/satchel/explorer = 1,
+					/obj/item/clothing/under/yogs/treasure = 1,
+					/obj/item/clothing/under/yogs/colony = 1,
 					/obj/item/clothing/glasses/regular = 2,
 					/obj/item/clothing/glasses/regular/jamjar = 1,
 					/obj/item/storage/bag/books = 1)
@@ -240,6 +268,10 @@
 					/obj/item/radio/headset/headset_srv = 2,
 					/obj/item/clothing/under/sl_suit = 2,
 					/obj/item/clothing/under/rank/bartender = 2,
+					/obj/item/clothing/under/yogs/billydonka = 2,
+					/obj/item/clothing/head/yogs/billydonkahat = 2,
+					/obj/item/cane = 2,
+					/obj/item/clothing/under/yogs/callumsuit = 2,
 					/obj/item/clothing/under/rank/bartender/purple = 2,
 					/obj/item/clothing/under/rank/bartender/skirt = 2,
 					/obj/item/clothing/accessory/waistcoat = 2,
@@ -251,7 +283,7 @@
 					/obj/item/clothing/suit/armor/vest/alt = 1,
 					/obj/item/circuitboard/machine/dish_drive = 1,
 					/obj/item/clothing/glasses/sunglasses/reagent = 1,
-					/obj/item/storage/belt/bandolier = 1) // yogs - removed pet collar
+					/obj/item/storage/belt/bandolier = 1)
 	premium = list(/obj/item/storage/box/dishdrive = 1)
 	refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
 	payment_department = ACCOUNT_SRV
@@ -288,22 +320,24 @@
 	icon_state = "janidrobe"
 	product_ads = "Come and get your janitorial clothing, now endorsed by lizard janitors everywhere!"
 	vend_reply = "Thank you for using the JaniDrobe!"
-	products = list(/obj/item/clothing/under/rank/janitor = 1,
-					/obj/item/cartridge/janitor = 1,
+	products = list(/obj/item/clothing/under/rank/janitor = 2,
+					/obj/item/clothing/under/yogs/casualjanitorsuit = 2,
+					/obj/item/clothing/suit/yogs/janitorcoat = 2,
+					/obj/item/cartridge/janitor = 2,
 					/obj/item/clothing/under/rank/janitor/skirt = 2,
-					/obj/item/clothing/gloves/color/black = 1,
-					/obj/item/clothing/head/soft/purple = 1,
-					/obj/item/paint/paint_remover = 1,
-					/obj/item/melee/flyswatter = 1,
-					/obj/item/flashlight = 1,
+					/obj/item/clothing/gloves/color/black = 2,
+					/obj/item/clothing/head/soft/purple = 2,
+					/obj/item/paint/paint_remover = 2,
+					/obj/item/melee/flyswatter = 2,
+					/obj/item/flashlight = 2,
 					/obj/item/clothing/suit/caution = 6,
-					/obj/item/holosign_creator/janibarrier = 1,
-					/obj/item/lightreplacer = 1,
-					/obj/item/soap/nanotrasen = 1,
-					/obj/item/storage/bag/trash = 1,
-					/obj/item/clothing/shoes/galoshes = 1,
-					/obj/item/watertank/janitor = 1,
-					/obj/item/storage/belt/janitor = 1)
+					/obj/item/holosign_creator/janibarrier = 2,
+					/obj/item/lightreplacer = 2,
+					/obj/item/soap/nanotrasen = 2,
+					/obj/item/storage/bag/trash = 2,
+					/obj/item/clothing/shoes/galoshes = 2,
+					/obj/item/watertank/janitor = 2,
+					/obj/item/storage/belt/janitor = 2)
 	refill_canister = /obj/item/vending_refill/wardrobe/jani_wardrobe
 	payment_department = ACCOUNT_SRV
 /obj/item/vending_refill/wardrobe/jani_wardrobe
@@ -315,21 +349,22 @@
 	icon_state = "lawdrobe"
 	product_ads = "OBJECTION! Get the rule of law for yourself!"
 	vend_reply = "Thank you for using the LawDrobe!"
-	products = list(/obj/item/clothing/under/lawyer/female = 1,
-					/obj/item/clothing/under/lawyer/black = 1,
-					/obj/item/clothing/under/lawyer/black/skirt = 1,
-					/obj/item/clothing/under/lawyer/red = 1,
-					/obj/item/clothing/under/lawyer/red/skirt = 1,
-					/obj/item/clothing/under/lawyer/bluesuit = 1,
-					/obj/item/clothing/under/lawyer/bluesuit/skirt = 1,
-					/obj/item/clothing/under/lawyer/blue/skirt = 1,
-					/obj/item/clothing/suit/toggle/lawyer = 1,
-					/obj/item/clothing/under/lawyer/purpsuit = 1,
-					/obj/item/clothing/under/lawyer/purpsuit/skirt = 1,
-					/obj/item/clothing/suit/toggle/lawyer/purple = 1,
-					/obj/item/clothing/under/lawyer/blacksuit = 1,
-					/obj/item/clothing/under/lawyer/blacksuit/skirt = 1,
-					/obj/item/clothing/suit/toggle/lawyer/black = 1,
+	products = list(/obj/item/clothing/under/lawyer/female = 2,
+					/obj/item/clothing/under/lawyer/black = 2,
+					/obj/item/clothing/under/lawyer/black/skirt = 2,
+					/obj/item/clothing/under/lawyer/red = 2,
+					/obj/item/clothing/under/lawyer/red/skirt = 2,
+					/obj/item/clothing/under/lawyer/bluesuit = 2,
+					/obj/item/clothing/under/lawyer/bluesuit/skirt = 2,
+					/obj/item/clothing/under/lawyer/blue/skirt = 2,
+					/obj/item/clothing/under/yogs/prosecutorsuit = 2,
+					/obj/item/clothing/suit/toggle/lawyer = 2,
+					/obj/item/clothing/under/lawyer/purpsuit = 2,
+					/obj/item/clothing/under/lawyer/purpsuit/skirt = 2,
+					/obj/item/clothing/suit/toggle/lawyer/purple = 2,
+					/obj/item/clothing/under/lawyer/blacksuit = 2,
+					/obj/item/clothing/under/lawyer/blacksuit/skirt = 2,
+					/obj/item/clothing/suit/toggle/lawyer/black = 2,
 					/obj/item/clothing/shoes/laceup = 2,
 					/obj/item/clothing/accessory/lawyers_badge = 2)
 	refill_canister = /obj/item/vending_refill/wardrobe/law_wardrobe
@@ -352,6 +387,12 @@
 					/obj/item/clothing/suit/chaplainsuit/nun = 1,
 					/obj/item/clothing/head/nun_hood = 1,
 					/obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
+					/obj/item/clothing/suit/yogs/witchhuntblue = 1,
+					/obj/item/clothing/under/yogs/fiendsuit = 1,
+					/obj/item/clothing/suit/hooded/fiendcowl = 1,
+					/obj/item/clothing/under/yogs/caretaker = 1,
+					/obj/item/clothing/suit/hooded/caretakercloak = 1,
+					/obj/item/clothing/suit/yogs/monkrobes = 1,
 					/obj/item/storage/fancy/candle_box = 2,
 					/obj/item/clothing/head/kippah = 3,
 					/obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
@@ -362,7 +403,8 @@
 					/obj/item/toy/plush/narplush = 1,
 					/obj/item/clothing/head/medievaljewhat = 3,
 					/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
-					/obj/item/clothing/head/clownmitre = 1)
+					/obj/item/clothing/head/clownmitre = 1,
+					/obj/item/clothing/head/yogs/goatpope = 1)
 	premium = list(/obj/item/clothing/suit/chaplainsuit/bishoprobe = 1,
 					/obj/item/clothing/head/bishopmitre = 1)
 	refill_canister = /obj/item/vending_refill/wardrobe/chap_wardrobe

yogstation.dme

@@ -484,6 +484,7 @@
 #include "code\datums\diseases\advance\symptoms\nanites.dm"
 #include "code\datums\diseases\advance\symptoms\narcolepsy.dm"
 #include "code\datums\diseases\advance\symptoms\oxygen.dm"
+#include "code\datums\diseases\advance\symptoms\radiation.dm"
 #include "code\datums\diseases\advance\symptoms\sensory.dm"
 #include "code\datums\diseases\advance\symptoms\shedding.dm"
 #include "code\datums\diseases\advance\symptoms\shivering.dm"
@@ -497,7 +498,6 @@
 #include "code\datums\diseases\advance\symptoms\vomit.dm"
 #include "code\datums\diseases\advance\symptoms\weight.dm"
 #include "code\datums\diseases\advance\symptoms\youth.dm"
-#include "code\datums\diseases\advance\symptoms\radiation.dm"
 #include "code\datums\helper_datums\events.dm"
 #include "code\datums\helper_datums\getrev.dm"
 #include "code\datums\helper_datums\icon_snapshot.dm"
@@ -2865,6 +2865,7 @@
 #include "code\modules\vending\engineering.dm"
 #include "code\modules\vending\engivend.dm"
 #include "code\modules\vending\games.dm"
+#include "code\modules\vending\gift.dm"
 #include "code\modules\vending\liberation.dm"
 #include "code\modules\vending\liberation_toy.dm"
 #include "code\modules\vending\magivend.dm"
@@ -3411,10 +3412,6 @@
 #include "yogstation\code\modules\surgery\organs\lungs.dm"
 #include "yogstation\code\modules\surgery\organs\shadowling_organs.dm"
 #include "yogstation\code\modules\uplink\uplink_item.dm"
-#include "yogstation\code\modules\vending\gift.dm"
-#include "yogstation\code\modules\vending\megaseed.dm"
-#include "yogstation\code\modules\vending\security.dm"
-#include "yogstation\code\modules\vending\wardrobes.dm"
 #include "yogstation\code\modules\webhook\webhook.dm"
 #include "yogstation\code\modules\xenoarch\loot\gigadrill.dm"
 #include "yogstation\code\modules\xenoarch\loot\guns.dm"