From 8692b51368d86a032b21a54c468a98723cb22847 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Fri, 27 Mar 2026 01:03:42 -0700 Subject: [PATCH 1/4] fixes dets receiving useless bullets in the mail --- .../modular_jobs/job_overrides/detective.dm | 11 +++++++++++ tgstation.dme | 1 + 2 files changed, 12 insertions(+) create mode 100644 modular_doppler/modular_jobs/job_overrides/detective.dm diff --git a/modular_doppler/modular_jobs/job_overrides/detective.dm b/modular_doppler/modular_jobs/job_overrides/detective.dm new file mode 100644 index 00000000000000..f0375f0d58ce2f --- /dev/null +++ b/modular_doppler/modular_jobs/job_overrides/detective.dm @@ -0,0 +1,11 @@ +/datum/job/detective + // removes unused tg revolver and ammo from the detective's mail goodies list, adds the new ammo and some detectivey stuff to fill out the missing slots. + mail_goodies = list( + /obj/item/storage/fancy/cigarettes = 25, + /obj/item/ammo_box/magazine/internal/cylinder/rev6mm = 10, + /obj/item/reagent_containers/cup/glass/bottle/whiskey = 2, + /obj/item/toy/crayon/white = 1, + /obj/item/pen/fountain = 2, + /obj/item/storage/box/evidence = 5, + /obj/item/card/id/advanced/plainclothes = 5, + ) diff --git a/tgstation.dme b/tgstation.dme index ffe01d18a67225..2cf95e91af30bc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7414,6 +7414,7 @@ #include "modular_doppler\modular_jobs\command_bodyguard\code\devices\choice_beacon.dm" #include "modular_doppler\modular_jobs\command_bodyguard\code\job_skillchips\command_bodyguard.dm" #include "modular_doppler\modular_jobs\department_radio\department_radio.dm" +#include "modular_doppler\modular_jobs\job_overrides\detective.dm" #include "modular_doppler\modular_mapping\code\areas\mining.dm" #include "modular_doppler\modular_mapping\code\areas\ruins.dm" #include "modular_doppler\modular_mapping\code\areas\station.dm" From c12e364e2e9c5a2d86ce85d988ba511e346dc398 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Fri, 27 Mar 2026 11:20:06 -0700 Subject: [PATCH 2/4] gives 357 ammo stacks --- .../modular_weapons/code/ammo_stacks/357.dm | 11 +++++++++++ tgstation.dme | 1 + 2 files changed, 12 insertions(+) create mode 100644 modular_doppler/modular_weapons/code/ammo_stacks/357.dm diff --git a/modular_doppler/modular_weapons/code/ammo_stacks/357.dm b/modular_doppler/modular_weapons/code/ammo_stacks/357.dm new file mode 100644 index 00000000000000..d959f8c866c031 --- /dev/null +++ b/modular_doppler/modular_weapons/code/ammo_stacks/357.dm @@ -0,0 +1,11 @@ +/obj/item/ammo_box/magazine/ammo_stack/c357 + name = ".357 casings" + desc = "A stack of .357 casings." + caliber = CALIBER_25EUROPA + ammo_type = /obj/item/ammo_casing/c357 + max_ammo = 5 // to make it worse than a speedloader, it's slightly mismatched to the cylinder size + casing_w_spacing = 2 + casing_z_padding = 6 + +/obj/item/ammo_box/magazine/ammo_stack/c357/full + start_empty = FALSE diff --git a/tgstation.dme b/tgstation.dme index 2cf95e91af30bc..a8020009dfa830 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7662,6 +7662,7 @@ #include "modular_doppler\modular_weapons\code\ammo\nb_34.dm" #include "modular_doppler\modular_weapons\code\ammo\sportsco_3mm.dm" #include "modular_doppler\modular_weapons\code\ammo\stingballs.dm" +#include "modular_doppler\modular_weapons\code\ammo_stacks\357.dm" #include "modular_doppler\modular_weapons\code\ammo_stacks\ammo_stack_base.dm" #include "modular_doppler\modular_weapons\code\ammo_stacks\europa_25.dm" #include "modular_doppler\modular_weapons\code\ammo_stacks\gibraltar.dm" From 4dd370de5f3259a41c635739b1e7240eb572b9fc Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Fri, 27 Mar 2026 18:45:47 -0700 Subject: [PATCH 3/4] Update detective.dm --- modular_doppler/modular_jobs/job_overrides/detective.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_doppler/modular_jobs/job_overrides/detective.dm b/modular_doppler/modular_jobs/job_overrides/detective.dm index f0375f0d58ce2f..01306cc77e0ba2 100644 --- a/modular_doppler/modular_jobs/job_overrides/detective.dm +++ b/modular_doppler/modular_jobs/job_overrides/detective.dm @@ -2,7 +2,8 @@ // removes unused tg revolver and ammo from the detective's mail goodies list, adds the new ammo and some detectivey stuff to fill out the missing slots. mail_goodies = list( /obj/item/storage/fancy/cigarettes = 25, - /obj/item/ammo_box/magazine/internal/cylinder/rev6mm = 10, + /obj/item/ammo_box/magazine/ammo_stack/c6ng/full = 5, + /obj/item/ammo_box/magazine/ammo_stack/c6ng/full/rubber = 5, /obj/item/reagent_containers/cup/glass/bottle/whiskey = 2, /obj/item/toy/crayon/white = 1, /obj/item/pen/fountain = 2, From 6b385cbce1d057e62ec6d6939e855bed433296a9 Mon Sep 17 00:00:00 2001 From: kittysmooch <105110468+kittysmooch@users.noreply.github.com> Date: Fri, 27 Mar 2026 20:32:42 -0700 Subject: [PATCH 4/4] Update 357.dm --- modular_doppler/modular_weapons/code/ammo_stacks/357.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_doppler/modular_weapons/code/ammo_stacks/357.dm b/modular_doppler/modular_weapons/code/ammo_stacks/357.dm index d959f8c866c031..72f4ed0845a7ad 100644 --- a/modular_doppler/modular_weapons/code/ammo_stacks/357.dm +++ b/modular_doppler/modular_weapons/code/ammo_stacks/357.dm @@ -1,7 +1,7 @@ /obj/item/ammo_box/magazine/ammo_stack/c357 name = ".357 casings" desc = "A stack of .357 casings." - caliber = CALIBER_25EUROPA + caliber = CALIBER_357 ammo_type = /obj/item/ammo_casing/c357 max_ammo = 5 // to make it worse than a speedloader, it's slightly mismatched to the cylinder size casing_w_spacing = 2