From fcf82dcf8c3a5cb7f78830e43ac3789364f642d3 Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Sun, 29 Sep 2024 06:43:14 +0200 Subject: [PATCH] Mail Update (#9077) --- code/controllers/subsystems/mail_ch.dm | 2 +- code/game/objects/items/mail_ch.dm | 35 +++++++++++-------- .../code/game/objects/items/target_toy.dm | 12 +++++++ vorestation.dme | 1 + 4 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 modular_chomp/code/game/objects/items/target_toy.dm diff --git a/code/controllers/subsystems/mail_ch.dm b/code/controllers/subsystems/mail_ch.dm index eea5ab4b3e..fd3b3e77db 100644 --- a/code/controllers/subsystems/mail_ch.dm +++ b/code/controllers/subsystems/mail_ch.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(mail) flags = SS_NO_TICK_CHECK | SS_NO_INIT var/mail_waiting = 0 // Pending mail - var/mail_per_process = 0.45 // Mail to be generated + var/mail_per_process = 0.55 // Mail to be generated var/admin_mail = list() // Mail added by Spawn Mail /datum/controller/subsystem/mail/fire() diff --git a/code/game/objects/items/mail_ch.dm b/code/game/objects/items/mail_ch.dm index 9573ccefa8..c93315ec7d 100644 --- a/code/game/objects/items/mail_ch.dm +++ b/code/game/objects/items/mail_ch.dm @@ -17,16 +17,16 @@ // Goodies which can be given to anyone. // Weight sum will be 1000 var/list/generic_goodies = list( - /obj/item/weapon/spacecash/c50 = 145, - /obj/item/weapon/reagent_containers/food/drinks/cans/cola = 130, - /obj/item/weapon/reagent_containers/food/snacks/chips = 130, - /obj/item/weapon/reagent_containers/food/drinks/coffee = 125, - /obj/item/weapon/reagent_containers/food/drinks/tea = 125, - /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt = 100, - /obj/item/weapon/spacecash/c100 = 75, - /obj/item/weapon/spacecash/c200 = 50, - /obj/item/weapon/spacecash/c500 = 25, - /obj/item/weapon/spacecash/c1000 = 10, + /obj/item/weapon/spacecash/c50 = 75, + /obj/item/weapon/reagent_containers/food/drinks/cans/cola = 75, + /obj/item/weapon/reagent_containers/food/snacks/chips = 75, + /obj/item/weapon/reagent_containers/food/drinks/coffee = 75, + /obj/item/weapon/reagent_containers/food/drinks/tea = 75, + /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/nt = 50, + /obj/item/weapon/spacecash/c100 = 40, + /obj/item/weapon/spacecash/c200 = 25, + /obj/item/weapon/spacecash/c500 = 15, + /obj/item/weapon/spacecash/c1000 = 5, /obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee = 5 ) // Overlays (pure fluff) @@ -339,7 +339,9 @@ /obj/item/smallDelivery, /obj/item/weapon/paper, /obj/item/stolenpackage, - /obj/item/contraband + /obj/item/contraband, + /obj/item/mail_scanner, + /obj/item/weapon/pen ) // Mail Scanner @@ -415,7 +417,7 @@ var/obj/junk = /obj/item/weapon/paper/fluff/junkmail_generic var/special_name = FALSE - if(prob(20)) + if(prob(25)) special_name = TRUE junk = pick(list( /obj/item/weapon/paper/pamphlet/gateway, @@ -432,7 +434,10 @@ /obj/item/weapon/reagent_containers/food/snacks/donkpocket/spicy, /obj/item/weapon/reagent_containers/food/snacks/donkpocket/teriyaki, /obj/item/toy/figure, - /obj/item/contraband + /obj/item/contraband, + /obj/item/weapon/, + /obj/item/weapon/tool/screwdriver/sdriver, + /obj/item/weapon/storage/briefcase/target_toy )) var/list/junk_names = list( @@ -450,7 +455,9 @@ /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/contraband = "[pick("oddly shaped", "strangely wrapped", "weird", "bulging")] [initial(name)]" + /obj/item/contraband = "[pick("oddly shaped", "strangely wrapped", "weird", "bulging")] [initial(name)]", + /obj/item/weapon/tool/screwdriver/sdriver = "[initial(name)] for Proffesor Who", + /obj/item/weapon/storage/briefcase/target_toy = "[initial(name)] for SIMPATHY, SUCCESS, MANHATTAN, BELIEFS" ) name = special_name ? junk_names[junk] : "important [initial(name)]" diff --git a/modular_chomp/code/game/objects/items/target_toy.dm b/modular_chomp/code/game/objects/items/target_toy.dm new file mode 100644 index 0000000000..79bc50d91b --- /dev/null +++ b/modular_chomp/code/game/objects/items/target_toy.dm @@ -0,0 +1,12 @@ +/obj/item/weapon/storage/briefcase/target_toy + starts_with = list( + /obj/item/weapon/paper/target, + /obj/item/weapon/gun/projectile/revolver/toy/big_iron, + /obj/item/weapon/grenade/confetti = 2 + ) + +/obj/item/weapon/paper/target + name = "target notice" + +/obj/item/weapon/paper/target/New() + info = {"Your target is [random_name(pick(MALE,FEMALE))]. Make sure they don't get out of there alive."} diff --git a/vorestation.dme b/vorestation.dme index d2f2b4d61c..53c84d63b5 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4768,6 +4768,7 @@ #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\target_toy.dm" #include "modular_chomp\code\game\objects\items\clockwork\ratvarian_spear.dm" #include "modular_chomp\code\game\objects\items\devices\flipper.dm" #include "modular_chomp\code\game\objects\items\devices\mind_binder.dm"