cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mail fixes, loot table updates and less junk mail (#7059)

Browse Source
This commit is contained in:
Guti
2023-10-12 15:55:43 -04:00
committed by GitHub
parent c262e908b9
commit 2044dd9fda
3 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/mail_ch.dm
+4 -3
View File
@@ -23,11 +23,13 @@ SUBSYSTEM_DEF(mail)
// Collect recipients
var/list/mail_recipients = list()
for(var/mob/living/carbon/human/player_human in player_list)
if(player_human.stat != DEAD && player_human.client && player_human.client.inactivity <= 10 MINUTES)
if(player_human.stat != DEAD && player_human.client && player_human.client.inactivity <= 10 MINUTES && player_human.job != JOB_OUTSIDER) // Only alive, active and NT employeers should be getting mail.
mail_recipients += player_human
// Creates mail for all the mail waiting to arrive, if there's nobody to receive it, it will be junkmail.
// Creates mail for all the mail waiting to arrive, if there's nobody to receive it, it will be a chance of junk mail.
for(var/mail_iterator in 1 to mail_waiting)
if(!mail_recipients.len && prob(40)) // Oh, no mail for our Employees? Well don't just sent them all the junk.
continue
var/obj/item/mail/new_mail
if(prob(70))
new_mail = new /obj/item/mail(mailcrate)
@@ -41,5 +43,4 @@ SUBSYSTEM_DEF(mail)
else
new_mail.junk_mail()
mail_waiting = 0
mailcrate.update_icon()
return mailcrate
code/game/objects/items/mail_ch.dm
+9 -22
View File
@@ -17,14 +17,14 @@
// Goodies which can be given to anyone.
// Weight sum will be 1000
var/list/generic_goodies = list(
/obj/item/weapon/reagent_containers/food/snacks/chips = 100,
/obj/item/weapon/reagent_containers/food/drinks/coffee = 100,
/obj/item/weapon/reagent_containers/food/drinks/tea = 100,
/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 100,
/obj/item/weapon/spacecash/c50 = 100,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt = 125,
/obj/item/weapon/spacecash/c100 = 125,
/obj/item/weapon/spacecash/c200 = 100,
/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt = 130,
/obj/item/weapon/spacecash/c50 = 125,
/obj/item/weapon/reagent_containers/food/snacks/chips = 105,
/obj/item/weapon/reagent_containers/food/drinks/coffee = 105,
/obj/item/weapon/reagent_containers/food/drinks/tea = 105,
/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 105,
/obj/item/weapon/spacecash/c100 = 100,
/obj/item/weapon/spacecash/c200 = 75,
/obj/item/weapon/spacecash/c500 = 50,
/obj/item/weapon/spacecash/c1000 = 20,
)
@@ -55,17 +55,6 @@
/obj/item/mail/Initialize()
. = ..()
RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling)
if(isnull(department_colors))
department_colors = list(
COLOR_CYAN_BLUE = DEPARTMENT_COMMAND,
COLOR_GREEN_GRAY = DEPARTMENT_CIVILIAN,
COLOR_PALE_ORANGE = DEPARTMENT_ENGINEERING,
COLOR_PALE_PURPLE_GRAY = DEPARTMENT_RESEARCH,
COLOR_PALE_BLUE_GRAY = DEPARTMENT_MEDICAL,
COLOR_PALE_GREEN_GRAY = DEPARTMENT_PLANET,
COLOR_BEIGE = DEPARTMENT_CARGO,
COLOR_PALE_RED_GRAY = DEPARTMENT_SECURITY,
)
// Icons
// Add some random stamps.
@@ -145,8 +134,7 @@
var/datum/job/this_job = SSjob.name_occupations[new_recipient.job]
if(this_job)
if(SSjob.get_primary_department_of_job(this_job) && department_colors[SSjob.get_primary_department_of_job(this_job)])
color = department_colors[SSjob.get_primary_department_of_job(this_job)]
color = this_job.selection_color
var/list/job_goodies = this_job.get_mail_goodies()
if(LAZYLEN(job_goodies))
if(this_job.exclusive_mail_goodies)
@@ -207,7 +195,6 @@
/obj/item/toy/figure = "[initial(name)] from DoN**K*oC"
)
color = pick(department_colors)
name = special_name ? junk_names[junk] : "important [initial(name)]"
junk = new junk(src)
modular_chomp/code/game/jobs/job/job_goodies.dm
+23 -10
View File
@@ -67,18 +67,21 @@
/datum/job/bartender
mail_goodies = list(
/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 700,
/obj/item/stack/material/uranium = 200,
/obj/item/clothing/accessory/bowtie/black = 100
/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 320,
"gelatin" = 300,
/obj/item/stack/material/uranium = 250,
/obj/item/clothing/accessory/bowtie/black = 100,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/nothing = 15,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/gelatin = 15,
)
/datum/job/chef
mail_goodies = list(
"cakebatter" = 200,
"cinnamonpowder" = 200,
/obj/item/weapon/reagent_containers/food/condiment/soysauce = 200,
/obj/item/weapon/reagent_containers/food/drinks/soymilk = 200,
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 200,
/obj/item/weapon/reagent_containers/glass/beaker/large = 200,
)
/datum/job/hydro
@@ -319,22 +322,32 @@
/obj/item/weapon/cell/super = 155,
/obj/item/weapon/cell/hyper = 125,
/obj/item/weapon/pen/fountain6 = 75,
/obj/effect/spawner/parts/t2 = 50,
/obj/effect/spawner/parts/t3 = 25,
/obj/item/toy/plushie/borgplushie/drake/sci = 20,
/obj/item/weapon/stock_parts/matter_bin/hyper = 15,
/obj/item/weapon/stock_parts/manipulator/hyper = 15,
/obj/item/weapon/stock_parts/capacitor/hyper = 15,
/obj/item/weapon/stock_parts/scanning_module/hyper = 15,
/obj/item/weapon/stock_parts/micro_laser/hyper = 15
)
/datum/job/scientist
mail_goodies = list(
/obj/item/stack/material/steel{amount = 10} = 250,
/obj/item/stack/material/glass{amount = 10} = 175,
/obj/effect/spawner/parts/t1 = 175,
/obj/item/stack/material/glass{amount = 10} = 200,
/obj/item/weapon/cell/super = 100,
/obj/item/weapon/cell/hyper = 100,
/obj/effect/spawner/parts/t2 = 75,
/obj/item/stack/material/plasteel{amount = 10} = 70,
/obj/item/weapon/stock_parts/matter_bin/adv = 45,
/obj/item/weapon/stock_parts/manipulator/nano = 45,
/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/effect/spawner/parts/t3 = 25,
/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,
/obj/item/weapon/stock_parts/scanning_module/phasic = 5,
/obj/item/weapon/stock_parts/micro_laser/ultra = 5
)
/datum/job/xenobiologist