Alternative title goodies (#7629)

2025-12-11 10:43:20 +00:00 · 2024-01-28 16:04:32 +01:00
parent f0f19f89a0
commit 96e3f24e75
5 changed files with 332 additions and 86 deletions
--- a/code/game/objects/items/mail_ch.dm
+++ b/code/game/objects/items/mail_ch.dm
@@ -143,7 +143,7 @@
 		var/image/envelope = image(icon, icon_state)
 		envelope.color = this_job.get_mail_color()
 		add_overlay(envelope)
-		var/list/job_goodies = this_job.get_mail_goodies()
+		var/list/job_goodies = this_job.get_mail_goodies(new_recipient, current_title)
 		if(LAZYLEN(job_goodies))
 			if(this_job.exclusive_mail_goodies)
 				goodies = job_goodies
@@ -204,7 +204,9 @@
 	can_hold = list(
 		/obj/item/mail,
 		/obj/item/smallDelivery,
-		/obj/item/weapon/paper
+		/obj/item/weapon/paper,
+		/obj/item/stolenpackage,
+		/obj/item/contraband
 	)

 // JUNK MAIL STUFF
@@ -234,7 +236,8 @@
 			/obj/item/weapon/reagent_containers/food/snacks/donkpocket/pizza,
 			/obj/item/weapon/reagent_containers/food/snacks/donkpocket/spicy,
 			/obj/item/weapon/reagent_containers/food/snacks/donkpocket/teriyaki,
-			/obj/item/toy/figure
+			/obj/item/toy/figure,
+			/obj/item/contraband
 		))

 	var/list/junk_names = list(
@@ -251,7 +254,8 @@
 		/obj/item/weapon/reagent_containers/food/snacks/donkpocket/pizza = "[initial(name)] with NEW PIZZA-POCKET.",
 		/obj/item/weapon/reagent_containers/food/snacks/donkpocket/spicy = "[initial(name)] with NEW SPICY-POCKET.",
 		/obj/item/weapon/reagent_containers/food/snacks/donkpocket/teriyaki = "[initial(name)] with NEW TERIYAKI-POCKET.",
-		/obj/item/toy/figure = "[initial(name)] from DoN**K*oC"
+		/obj/item/toy/figure = "[initial(name)] from DoN**K*oC",
+		/obj/item/contraband = "[pick("oddly shaped", "strangely wrapped", "weird", "bulging")] [initial(name)]"
 	)

 	name = special_name ? junk_names[junk] : "important [initial(name)]"
--- a/modular_chomp/code/game/jobs/job/job_goodies.dm
+++ b/modular_chomp/code/game/jobs/job/job_goodies.dm
@@ -6,11 +6,19 @@

 /datum/alt_title/
 	var/list/mail_goodies = list()
-	var/exclusive_mail_goodies = FALSE

 // Get mail goodies
-/datum/job/proc/get_mail_goodies(mob/recipient)
-	return mail_goodies
+/datum/job/proc/get_mail_goodies(mob/recipient, var/alt_title)
+	var/list/goodies = list()
+	goodies |= mail_goodies
+
+	if(alt_titles && alt_titles)
+		var/typepath = alt_titles[alt_title]
+		if(typepath)
+			var/datum/alt_title/A = new typepath()
+			if(A.mail_goodies)
+				goodies |= A.mail_goodies
+	return goodies

 // Get mail colour
 /datum/job/proc/get_mail_color(mob/recipient)
@@ -31,6 +39,88 @@
 	)
 	mail_color = COMMS_COLOR_ENTERTAIN

+/datum/alt_title/intern_eng
+	mail_goodies = list(
+		/obj/item/weapon/cell/device = 200,
+		/obj/item/weapon/cell = 175,
+		/obj/item/weapon/storage/belt/utility = 150,
+		/obj/item/weapon/cell/high = 125,
+		/obj/item/weapon/tool/wrench = 125,
+		/obj/item/weapon/tool/screwdriver = 125,
+		/obj/item/device/geiger = 100
+	)
+
+/datum/alt_title/intern_med
+	mail_goodies = list(
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn = 200,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma = 200,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox = 200,
+		/obj/item/stack/medical/ointment = 100,
+		/obj/item/stack/medical/bruise_pack = 100,
+		/obj/item/weapon/storage/pill_bottle/paracetamol = 100,
+		/obj/item/weapon/storage/pill_bottle/blood_regen = 50,
+		/obj/item/weapon/storage/pill_bottle/assorted = 50,
+	)
+
+/datum/alt_title/intern_sci
+	mail_goodies = list(
+		/obj/item/weapon/cell/device = 200,
+		/obj/item/weapon/cell = 175,
+		/obj/item/weapon/storage/belt/utility = 150,
+		/obj/item/weapon/cell/high = 125,
+		/obj/item/weapon/tool/wrench = 125,
+		/obj/item/weapon/tool/screwdriver = 125,
+		/obj/item/weapon/cell/device/hyper = 50,
+		/obj/item/weapon/cell/hyper = 50,
+	)
+
+/datum/alt_title/intern_sec
+	mail_goodies = list(
+		/obj/item/weapon/reagent_containers/food/snacks/donut/plain = 200,
+		/obj/item/poster/custom = 200,
+		/obj/item/device/ticket_printer = 200,
+		/obj/item/device/holowarrant = 200,
+		/obj/item/device/retail_scanner/security = 100,
+		/obj/item/taperoll/police = 100
+	)
+
+/datum/alt_title/intern_crg
+	mail_goodies = list(
+		/obj/item/weapon/wrapping_paper = 200,
+		/obj/item/weapon/form_printer = 200,
+		/obj/item/poster/custom = 200,
+		/obj/item/stack/material/wood{amount = 10} = 100,
+		/obj/item/stack/material/steel{amount = 10} = 100,
+		/obj/item/weapon/pickaxe = 100,
+		/obj/item/stack/marker_beacon = 100,
+	)
+
+/datum/alt_title/intern_exp
+	mail_goodies = list(
+		/obj/item/weapon/storage/mre/menu2 = 800,
+		/obj/item/device/binoculars/spyglass = 150,
+		/obj/item/weapon/cell/device/hyper = 50,
+	)
+
+/datum/alt_title/server
+	mail_goodies = list(
+		/obj/item/weapon/tray = 200,
+		/obj/item/weapon/material/kitchen/utensil/fork = 200,
+		/obj/item/weapon/material/knife/plastic = 200,
+		/obj/item/weapon/reagent_containers/food/snacks/tofu = 200,
+		/obj/item/weapon/reagent_containers/food/snacks/candy_corn = 200,
+	)
+
+/datum/alt_title/assistant
+
+// Visitor
+
+/datum/job/assistant
+
+/datum/alt_title/guest
+
+/datum/alt_title/traveler
+
 // Cargo

 /datum/job/qm
@@ -50,19 +140,32 @@

 /datum/job/cargo_tech
 	mail_goodies = list(
-		/obj/item/poster = 200,
+		/obj/item/pizzavoucher = 375,
+		/obj/item/poster/custom = 200,
 		/obj/item/stack/material/steel{amount = 10} = 150,
 		/obj/item/stack/material/glass{amount = 10} = 150,
 		/obj/item/stack/material/wood{amount = 10} = 150,
-		/obj/item/pizzabox/margherita = 75,
-		/obj/item/pizzabox/mushroom = 75,
-		/obj/item/pizzabox/meat = 75,
-		/obj/item/pizzabox/vegetable = 75,
-		/obj/item/pizzabox/pineapple = 75,
-		/obj/item/weapon/coin/silver = 50,
+		/obj/item/weapon/coin/silver = 50
 	)
 	mail_color = COMMS_COLOR_SUPPLY

+/datum/alt_title/disposal_sorter
+	mail_goodies = list(
+		/obj/item/clothing/gloves/black = 300,
+		/obj/item/weapon/reagent_containers/spray/sterilizine = 300,
+		/obj/item/weapon/storage/bag/trash = 300,
+		/obj/item/weapon/coin/silver = 80,
+		/obj/item/weapon/storage/bag/trash/holding = 20
+	)
+
+/datum/alt_title/mailman
+	mail_goodies = list(
+		/obj/item/poster/custom = 300,
+		/obj/item/weapon/wrapping_paper = 300,
+		/obj/item/pizzavoucher = 300,
+		/obj/item/weapon/coin/silver = 100,
+	)
+
 /datum/job/mining
 	mail_goodies = list(
 		/obj/item/weapon/plastique/seismic/locked = 150,
@@ -76,6 +179,23 @@
 	)
 	mail_color = COMMS_COLOR_SUPPLY

+/datum/alt_title/drill_tech
+	mail_goodies = list(
+		/obj/item/stack/marker_beacon/ten = 250,
+		/obj/item/device/perfect_tele/one_beacon = 125,
+		/obj/item/clothing/shoes/bhop = 125,
+		/obj/item/weapon/inducer = 125,
+		/obj/item/weapon/stock_parts/manipulator/nano = 50,
+		/obj/item/weapon/stock_parts/capacitor/adv = 50,
+		/obj/item/weapon/stock_parts/scanning_module/adv = 50,
+		/obj/item/weapon/stock_parts/micro_laser/high = 50,
+		/obj/item/weapon/stock_parts/matter_bin/super = 10,
+		/obj/item/weapon/stock_parts/manipulator/pico = 10,
+		/obj/item/weapon/stock_parts/capacitor/super = 10,
+		/obj/item/weapon/stock_parts/scanning_module/phasic = 10,
+		/obj/item/weapon/stock_parts/micro_laser/ultra = 10
+	)
+
 // Civilian

 /datum/job/bartender
@@ -89,10 +209,20 @@
 	)
 	mail_color = COMMS_COLOR_SERVICE

+/datum/alt_title/barista
+	mail_goodies = list(
+		/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 300,
+		/obj/item/weapon/reagent_containers/glass/bottle/gelatin = 225,
+		/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 225,
+		/obj/item/weapon/reagent_containers/glass/bottle/cinnamonpowder = 100,
+		/obj/item/weapon/reagent_containers/food/drinks/teapot = 100,
+		/obj/item/weapon/reagent_containers/chem_disp_cartridge/gelatin = 50,
+	)
+
 /datum/job/chef
 	mail_goodies = list(
 		/obj/item/weapon/reagent_containers/food/condiment/soysauce = 250,
-		/obj/item/weapon/reagent_containers/food/drinks/soymilk = 250,
+		/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 250,
 		/obj/item/weapon/reagent_containers/glass/bottle/cakebatter = 200,
 		/obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 200,
 		/obj/item/weapon/reagent_containers/glass/bottle/cinnamonpowder = 100
@@ -120,7 +250,8 @@
 		/obj/item/weapon/soap = 100,
 		/obj/item/weapon/grenade/chem_grenade/cleaner = 100,
 		/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed = 50,
-		/obj/item/toy/plushie/borgplushie/drake/jani = 50,
+		/obj/item/weapon/storage/bag/trash/holding = 25,
+		/obj/item/toy/plushie/borgplushie/drake/jani = 25,
 	)
 	mail_color = COMMS_COLOR_SERVICE

@@ -155,31 +286,52 @@
 	mail_color = COMMS_COLOR_SERVICE

 /datum/job/entertainer
-		// Still need to separate the goodies for each title, mimes and clows shouldn't get the same thing.
+		// These need new goodes...
 	mail_goodies = list(
-		/obj/fruitspawner/banana = 200,	// Perfect for clowns.
-		/obj/item/weapon/reagent_containers/food/snacks/baguette = 175,	// Of course, MIMES. They're FRENCH.
-		/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 175,
-		/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing = 175,
-		/obj/random/instrument = 175,
-		/obj/item/weapon/storage/pill_bottle/dice_nerd = 100,
+		/obj/random/instrument = 600,
+		/obj/item/weapon/storage/pill_bottle/dice_nerd = 400,
 	)
 	mail_color = COMMS_COLOR_SERVICE

+/datum/alt_title/clown
+	mail_goodies = list(
+		/obj/fruitspawner/banana = 200,
+		/obj/item/weapon/pen/crayon/rainbow = 200,
+		/obj/item/weapon/bikehorn = 200,
+		/obj/item/weapon/soap/rainbow_soap = 100,
+		/obj/item/weapon/reagent_containers/spray/waterflower = 100,
+		/obj/item/weapon/reagent_containers/glass/bottle/lube = 100,
+		/obj/item/weapon/reagent_containers/food/snacks/pie = 100
+	)
+
+/datum/alt_title/mime
+	mail_goodies = list(
+		/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 250,
+		/obj/item/weapon/reagent_containers/glass/bottle/nothing = 250,
+		/obj/item/weapon/reagent_containers/food/snacks/baguette = 200,
+		/obj/item/weapon/pen/crayon/mime = 200
+	)
 /datum/job/entrepreneur // Same for these guys! What could they get?
 	mail_goodies = list(
 		/obj/item/weapon/reagent_containers/food/drinks/coffee = 1000, // For now, they'll get extra on coffee.
 	)
 	mail_color = COMMS_COLOR_SERVICE

+/datum/alt_title/paranormal_investigator
+	mail_goodies = list(
+		/obj/item/weapon/storage/fancy/candle_box = 340,
+		/obj/item/weapon/storage/fancy/whitecandle_box = 330,
+		/obj/item/weapon/storage/fancy/blackcandle_box = 330
+	)
+
 // Command

 /datum/job/captain
 	mail_goodies = list(
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 250,
 		/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 250,
-		/obj/item/weapon/form_printer = 200,
 		/obj/item/weapon/storage/fancy/cigar/havana = 250,
+		/obj/item/weapon/form_printer = 200,
 		/obj/item/weapon/pen/fountain6 = 50
 	)
 	mail_color = COMMS_COLOR_COMMAND
@@ -222,30 +374,38 @@

 /datum/job/engineer
 	mail_goodies = list(
-		/obj/item/stack/material/steel{amount = 10} = 135,
-		/obj/item/stack/material/lead{amount = 10} = 135,
-		/obj/item/stack/material/glass/reinforced{amount = 10} = 135,
-		/obj/item/weapon/storage/box/lights/mixed = 125,
-		/obj/item/device/lightreplacer = 120,
-		/obj/item/stack/cable_coil = 110,
-		/obj/item/weapon/rcd_ammo = 110,
+		/obj/item/stack/material/steel{amount = 10} = 235,
+		/obj/item/stack/material/lead{amount = 10} = 235,
+		/obj/item/stack/material/glass/reinforced{amount = 10} = 235,
+		/obj/item/weapon/rcd_ammo = 155,
 		/obj/item/stack/material/plasteel{amount = 10} = 100,
 		/obj/item/weapon/tool/screwdriver/power = 10,
 		/obj/item/weapon/tool/wirecutters/power = 10,
-		/obj/item/weapon/weldingtool/electric = 10,
+		/obj/item/weapon/weldingtool/experimental = 10,
 		/obj/item/weapon/tool/wrench/power = 10,
 	)
 	mail_color = COMMS_COLOR_ENGINEER

+/datum/alt_title/electrician
+	mail_goodies = list(
+		/obj/item/weapon/storage/box/lights/mixed = 250,
+		/obj/item/stack/cable_coil = 250,
+		/obj/item/clothing/gloves/yellow = 200,
+		/obj/item/stack/cable_coil/heavyduty = 210,
+		/obj/item/weapon/tool/screwdriver/power = 10,
+		/obj/item/weapon/tool/wirecutters/power = 10,
+		/obj/item/weapon/weldingtool/experimental = 10,
+		/obj/item/weapon/tool/wrench/power = 10,
+	)
+
 /datum/job/atmos
 	mail_goodies = list(
 		/obj/item/stack/material/steel{amount = 10} = 330,
 		/obj/item/device/analyzer = 300,
-		/obj/item/weapon/holosign_creator/combifan = 225,
-		/obj/item/weapon/pipe_dispenser = 125,
+		/obj/item/weapon/holosign_creator/combifan = 230,
+		/obj/item/weapon/pipe_dispenser = 130,
 		/obj/item/weapon/tool/screwdriver/power = 10,
 		/obj/item/weapon/tool/wirecutters/power = 10,
-		/obj/item/weapon/weldingtool/electric = 10,
 		/obj/item/weapon/weldingtool/experimental = 10,
 	)
 	mail_color = COMMS_COLOR_ENGINEER
@@ -254,9 +414,12 @@

 /datum/job/pathfinder
 	mail_goodies = list(
-		/obj/item/device/binoculars/spyglass = 500,
+		/obj/item/device/binoculars/spyglass = 300,
 		/obj/item/device/cataloguer/advanced = 200,
 		/obj/item/weapon/storage/mre/menu2 = 150,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute = 100,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn = 100,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin = 100,
 		/obj/item/weapon/cell/device/hyper = 100,
 		/obj/item/device/flashlight/slime = 50,
 	)
@@ -264,67 +427,101 @@

 /datum/job/pilot
 	mail_goodies = list(
-		/obj/item/weapon/storage/mre/menu2 = 500,
-		/obj/item/weapon/tank/oxygen = 200,
-		/obj/item/weapon/tank/air = 200,
+		/obj/item/weapon/storage/mre/menu2 = 400,
+		/obj/item/weapon/tank/air = 250,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute = 100,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn = 100,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin = 100,
 		/obj/item/weapon/cell/device/hyper = 50,
-		/obj/item/weapon/storage/firstaid/regular = 10,
-		/obj/item/weapon/storage/firstaid/toxin = 10,
-		/obj/item/weapon/storage/firstaid/o2 = 10,
-		/obj/item/weapon/storage/firstaid/adv = 10,
-		/obj/item/weapon/storage/firstaid/fire = 10,
 	)
 	mail_color = "#274d0a"

 /datum/job/explorer
 	mail_goodies = list(
-		/obj/item/weapon/storage/mre/menu2 = 800,
+		/obj/item/weapon/storage/mre/menu2 = 500,
 		/obj/item/device/binoculars/spyglass = 150,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute = 100,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn = 100,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin = 100,
 		/obj/item/weapon/cell/device/hyper = 50,
 	)
 	mail_color = "#274d0a"

 /datum/job/sar
 	mail_goodies = list(
-		/obj/item/weapon/storage/mre/menu2 = 950,
-		/obj/item/weapon/storage/firstaid/regular = 10,
-		/obj/item/weapon/storage/firstaid/toxin = 10,
-		/obj/item/weapon/storage/firstaid/o2 = 10,
-		/obj/item/weapon/storage/firstaid/adv = 10,
-		/obj/item/weapon/storage/firstaid/fire = 10,
+		/obj/item/weapon/storage/mre/menu2 = 500,
+		/obj/item/weapon/storage/pill_bottle/antitox = 100,
+		/obj/item/weapon/storage/pill_bottle/dexalin_plus = 100,
+		/obj/item/weapon/storage/pill_bottle/kelotane = 100,
+		/obj/item/weapon/storage/firstaid/adv = 75,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute = 25,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn = 25,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin = 25,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity = 10,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/pain = 10,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ = 10,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat = 5,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting = 5,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites = 5,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed = 5
 	)
 	mail_color = "#274d0a"

 // Medical
 /datum/job/cmo
 	mail_goodies = list(
-		/obj/item/device/healthanalyzer/advanced = 250,
+		/obj/item/device/healthanalyzer/advanced = 270,
 		/obj/item/weapon/reagent_containers/hypospray = 250,
-		/obj/item/weapon/storage/firstaid/experimental = 200,
-		/obj/item/weapon/reagent_containers/blood/OMinus = 150,
-		/obj/item/weapon/pen/fountain6 = 50,
-		/obj/item/weapon/surgical/scalpel/laser1 = 20,
+		/obj/item/weapon/reagent_containers/blood/OMinus = 250,
+		/obj/item/weapon/pen/fountain6 = 75,
 		/obj/item/weapon/surgical/scalpel/manager = 20,
 		/obj/item/weapon/surgical/circular_saw/manager = 20,
-		/obj/item/weapon/reagent_containers/pill/myelamine = 20,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed = 20,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting = 20,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/organ = 20,
 		/obj/item/toy/plushie/borgplushie/medihound = 20,
+		/obj/item/weapon/reagent_containers/pill/healing_nanites = 15,
 	)
 	mail_color = COMMS_COLOR_COMMAND

 /datum/job/doctor
 	mail_goodies = list(
-		/obj/item/device/healthanalyzer/improved = 250,
+		/obj/item/weapon/reagent_containers/syringe/antiviral = 200,
 		/obj/item/weapon/reagent_containers/spray/sterilizine = 200,
-		/obj/item/weapon/reagent_containers/syringe/antiviral = 100,
-		/obj/item/weapon/reagent_containers/hypospray = 100,
-		/obj/item/weapon/storage/pill_bottle/tramadol = 75,
-		/obj/item/weapon/storage/pill_bottle/antitox = 75,
-		/obj/item/weapon/reagent_containers/blood/OMinus = 50,
-		/obj/item/weapon/storage/firstaid/experimental = 40,
-		/obj/item/weapon/reagent_containers/pill/myelamine = 10
+		/obj/item/weapon/storage/pill_bottle/tramadol = 125,
+		/obj/item/weapon/storage/pill_bottle/antitox = 125,
+		/obj/item/weapon/reagent_containers/blood/OMinus = 125,
+		/obj/item/device/healthanalyzer/improved = 150,
+		/obj/item/weapon/storage/pill_bottle/neotane = 10,
+		/obj/item/weapon/storage/pill_bottle/burncard = 10,
+		/obj/item/weapon/storage/pill_bottle/flamecure = 10,
+		/obj/item/weapon/storage/pill_bottle/purifyingagent = 10,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting = 10
 	)
 	mail_color = COMMS_COLOR_MEDICAL

+/datum/alt_title/surgeon
+	mail_goodies = list(
+		/obj/item/weapon/reagent_containers/spray/sterilizine = 300,
+		/obj/item/device/healthanalyzer/improved = 170,
+		/obj/item/weapon/reagent_containers/blood/OMinus = 170,
+		/obj/item/stack/medical/advanced/bruise_pack = 150,
+		/obj/item/stack/medical/advanced/ointment = 150,
+		/obj/item/weapon/surgical/bone_clamp = 20,
+		/obj/item/weapon/surgical/scalpel/manager = 20,
+		/obj/item/weapon/surgical/circular_saw/manager = 20,
+	)
+
+/datum/alt_title/virologist
+	mail_goodies = list(
+		/obj/item/weapon/virusdish/random = 200,
+		/obj/item/weapon/storage/pill_bottle/spaceacillin = 150,
+		/obj/item/clothing/mask/surgical = 150,
+		/obj/item/clothing/gloves/sterile/latex = 150,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin = 100,
+		/obj/item/weapon/reagent_containers/blood/OMinus = 100,
+	)
+
 /datum/job/chemist
 	mail_goodies = list(
 		/obj/item/weapon/storage/pill_bottle = 235,
@@ -338,26 +535,37 @@

 /datum/job/psychiatrist
 	mail_goodies = list(
-		/obj/item/toy/plushie/orange_cat = 225,
-		/obj/item/toy/plushie/borgplushie/drake/jani = 225,
 		/obj/item/toy/plushie/carp = 225,
 		/obj/item/toy/plushie/blue_fox = 225,
+		/obj/item/toy/plushie/orange_cat = 200,
+		/obj/item/toy/plushie/borgplushie/drake/jani = 200,
 		/obj/item/toy/plushie/shark = 75,
 		/obj/item/weapon/storage/pill_bottle/happy = 50,
+		/obj/item/weapon/storage/pill_bottle/citalopram = 50
 	)
 	mail_color = COMMS_COLOR_MEDICAL

+/datum/job/geneticist
+	mail_goodies = list(
+		/obj/item/weapon/reagent_containers/food/snacks/monkeycube = 600,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/toxin = 200,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity = 200,
+	)
+	mail_color = COMMS_COLOR_MEDICAL
+
+
 /datum/job/paramedic
 	mail_goodies = list(
-		/obj/item/stack/medical/bruise_pack = 175,
-		/obj/item/stack/medical/ointment = 175,
-		/obj/item/stack/medical/advanced/bruise_pack = 125,
-		/obj/item/stack/medical/advanced/ointment = 125,
+		/obj/item/stack/medical/bruise_pack = 200,
+		/obj/item/stack/medical/ointment = 200,
+		/obj/item/stack/medical/advanced/bruise_pack = 175,
+		/obj/item/stack/medical/advanced/ointment = 175,
 		/obj/item/weapon/reagent_containers/syringe/antiviral = 100,
-		/obj/item/weapon/reagent_containers/hypospray = 100,
 		/obj/item/weapon/storage/pill_bottle/tramadol = 100,
-		/obj/item/weapon/storage/pill_bottle/antitox = 50,
-		/obj/item/weapon/storage/firstaid/experimental = 40,
+		/obj/item/weapon/storage/pill_bottle/neotane = 10,
+		/obj/item/weapon/storage/pill_bottle/burncard = 10,
+		/obj/item/weapon/storage/pill_bottle/flamecure = 10,
+		/obj/item/weapon/storage/pill_bottle/purifyingagent = 10,
 		/obj/item/weapon/reagent_containers/pill/myelamine = 10
 	)
 	mail_color = COMMS_COLOR_MEDICAL
@@ -392,7 +600,7 @@
 		/obj/item/weapon/stock_parts/capacitor/adv = 45,
 		/obj/item/weapon/stock_parts/scanning_module/adv = 45,
 		/obj/item/weapon/stock_parts/micro_laser/high = 45,
-		/obj/item/stack/nanopaste = 30,
+		/obj/item/stack/nanopaste/advanced = 30,
 		/obj/item/weapon/stock_parts/matter_bin/super = 5,
 		/obj/item/weapon/stock_parts/manipulator/pico = 5,
 		/obj/item/weapon/stock_parts/capacitor/super = 5,
@@ -415,19 +623,19 @@
 		/obj/item/trash/rkibble = 200,
 		/obj/item/stack/material/steel{amount = 10} = 150,
 		/obj/item/device/robotanalyzer = 125,
-		/obj/item/device/kit/paint/ripley = 75,
-		/obj/item/device/kit/paint/gygax = 75,
-		/obj/item/device/kit/paint/durand = 75,
-		/obj/item/device/kit/paint/ripley/death = 60,
-		/obj/item/device/kit/paint/durand/seraph = 55,
-		/obj/item/device/kit/paint/durand/phazon = 55,
-		/obj/item/device/kit/paint/gygax/darkgygax = 25,
-		/obj/item/device/kit/paint/ripley/flames_red = 25,
-		/obj/item/device/kit/paint/gygax/recitence = 20,
-		/obj/item/device/kit/paint/ripley/flames_blue = 20,
+		/obj/item/stack/nanopaste/advanced = 85,
+		/obj/item/device/kit/paint/ripley = 55,
+		/obj/item/device/kit/paint/gygax = 55,
+		/obj/item/device/kit/paint/durand = 55,
+		/obj/item/device/kit/paint/ripley/death = 45,
+		/obj/item/device/kit/paint/durand/seraph = 45,
+		/obj/item/device/kit/paint/durand/phazon = 45,
+		/obj/item/device/kit/paint/gygax/darkgygax = 30,
+		/obj/item/device/kit/paint/ripley/flames_red = 30,
+		/obj/item/device/kit/paint/gygax/recitence = 25,
+		/obj/item/device/kit/paint/ripley/flames_blue = 25,
 		/obj/item/weapon/tool/screwdriver/power = 10,
 		/obj/item/weapon/tool/wirecutters/power = 10,
-		/obj/item/weapon/weldingtool/electric = 10,
 		/obj/item/weapon/weldingtool/experimental = 10,
 	)
 	mail_color = COMMS_COLOR_SCIENCE
--- a/modular_chomp/code/game/objects/items/contraband.dm
+++ b/modular_chomp/code/game/objects/items/contraband.dm
@@ -0,0 +1,27 @@
+/obj/item/contraband
+	name = "contraband"
+	desc = "A tightly sealed package. Dare to look inside?"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "deliverycrate5"
+	item_state = "table_parts"
+	w_class = ITEMSIZE_HUGE
+
+/obj/item/contraband/attack_self(mob/user)
+	var/contraband = pick(
+		/obj/item/weapon/reagent_containers/glass/beaker/vial/macrocillin,
+		/obj/item/weapon/reagent_containers/glass/beaker/vial/microcillin,
+		/obj/item/weapon/gun/energy/sizegun/not_advanced,
+		/obj/item/clothing/mask/muzzle,
+		/obj/item/device/pda/clown,
+		/obj/item/device/pda/mime,
+		/obj/item/weapon/storage/fancy/cigar/havana,
+		/obj/item/weapon/card/emag_broken,
+		/obj/item/device/sleevemate,
+		/obj/item/weapon/disk/nifsoft/compliance,
+		/obj/item/seeds/ambrosiadeusseed,
+		/obj/item/seeds/ambrosiavulgarisseed,
+		/obj/item/device/bodysnatcher)
+
+	user.put_in_hands(new contraband(usr.loc))
+	to_chat(user, "You unwrap the package.")
+	qdel(src)
--- a/modular_chomp/code/modules/food/glass/bottle.dm
+++ b/modular_chomp/code/modules/food/glass/bottle.dm
@@ -21,3 +21,9 @@
 	desc = "A bottle full of gelatin."
 	icon_state = "bottle-1"
 	prefill = list("gelatin" = 60)
+
+/obj/item/weapon/reagent_containers/glass/bottle/lube
+	name = "lube bottle"
+	desc = "A bottle full of lube."
+	icon_state = "bottle-1"
+	prefill = list("lube" = 60)
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4648,6 +4648,7 @@
 #include "modular_chomp\code\game\objects\mob_spawner.dm"
 #include "modular_chomp\code\game\objects\effects\dark_growth.dm"
 #include "modular_chomp\code\game\objects\effects\step_triggers.dm"
+#include "modular_chomp\code\game\objects\items\contraband.dm"
 #include "modular_chomp\code\game\objects\items\holosign_creator.dm"
 #include "modular_chomp\code\game\objects\items\petrifier.dm"
 #include "modular_chomp\code\game\objects\items\clockwork\ratvarian_spear.dm"