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..01306cc77e0ba2 --- /dev/null +++ b/modular_doppler/modular_jobs/job_overrides/detective.dm @@ -0,0 +1,12 @@ +/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/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, + /obj/item/storage/box/evidence = 5, + /obj/item/card/id/advanced/plainclothes = 5, + ) 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..72f4ed0845a7ad --- /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_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 + 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 ffe01d18a67225..a8020009dfa830 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" @@ -7661,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"