Skip to content
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

bounty cycler shotgun fix + mail token tray for borgs #4163

Merged
merged 1 commit into from
Nov 11, 2024
Merged

bounty cycler shotgun fix + mail token tray for borgs #4163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/ballistic/shotgun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/bounty
name = "bounty cycler shotgun"
desc = "An advanced shotgun with two separate magazine tubes. This one shows signs of bounty hunting customization, meaning it likely has a dual rubber shot/fire slug load."
alt_accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/tube/fire
//alt_accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/tube/fire monkestation edit

/obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user)
. = ..()
Expand Down
18 changes: 16 additions & 2 deletions monkestation/code/modules/cargo/mail/mail_token.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/obj/item/cargo/mail_token
name = "mail token"
desc = "A plastic mail token. Part of a new program to get Nanotrasen cargo employees to deliver mail.\
Can be exported to Central Command for an increase to the budget. The back of the token seems to have barcode on it for handling tips."
desc = "A plastic mail token. Part of a new program to get Nanotrasen cargo employees to deliver mail. It can be exported to Central Command for an increase to the budget. The back of the token seems to have barcode on it for handling tips."
icon = 'monkestation/code/modules/cargo/mail/mail.dmi'
w_class = WEIGHT_CLASS_TINY
icon_state = "mailtoken-1"
Expand All @@ -19,3 +18,18 @@
unit_name = "mail token"
k_elasticity = 0
export_types = list(/obj/item/cargo/mail_token)

/obj/item/storage/bag/mail_token_catcher
name = "mail token tray"
desc = "A tray for holding mail tokens."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper_bin0"

/obj/item/storage/bag/mail_token_catcher/Initialize(mapload)
. = ..()
atom_storage.max_total_storage = 200
atom_storage.max_slots = 7
atom_storage.numerical_stacking = FALSE
atom_storage.set_holdable(list(
/obj/item/cargo/mail_token,
))
1 change: 1 addition & 0 deletions monkestation/code/modules/cargoborg/code/cargo_module.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/obj/item/assembly/flash/cyborg,
/obj/item/borg/hydraulic_clamp,
/obj/item/borg/hydraulic_clamp/mail,
/obj/item/storage/bag/mail_token_catcher, //monkestation edit
/obj/item/hand_labeler/cyborg,
/obj/item/dest_tagger,
/obj/item/crowbar/cyborg,
Expand Down
Loading