Skip to content

fixes a few small bugs and closes out of date issues #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kittysmooch wants to merge 4 commits into
base: master
Choose a base branch
from
+25 −0
Open

fixes a few small bugs and closes out of date issues #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8692b51
fixes dets receiving useless bullets in the mail
kittysmooch Mar 27, 2026
c12e364
gives 357 ammo stacks
kittysmooch Mar 27, 2026
4dd370d
Update detective.dm
kittysmooch Mar 28, 2026
6b385cb
Update 357.dm
kittysmooch Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modular_doppler/modular_jobs/job_overrides/detective.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
)
11 changes: 11 additions & 0 deletions modular_doppler/modular_weapons/code/ammo_stacks/357.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading