Skip to content

[TM ONLY] Makes phones works across Z-levels and other areas #156

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
DiscordWizard wants to merge 3 commits into
base: master
Choose a base branch
from
+4 −1
Open

[TM ONLY] Makes phones works across Z-levels and other areas #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b760539
Phone worky
DiscordWizard Aug 28, 2026
7d95d28
Merge branch 'master' into master
dwinters99 Aug 28, 2026
9f27d33
Merge branch 'master' into master
dwinters99 Aug 31, 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
2 changes: 1 addition & 1 deletion modular_darkpack/modules/phones/code/_phone.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
if(!sim_card && default_sim_card_type)
sim_card = new default_sim_card_type(src)
sim_card.phone_weakref = WEAKREF(src)
phone_radio = new(src)
phone_radio = new /obj/item/radio/phone(src)

@dwinters99 dwinters99 Aug 28, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
phone_radio = new /obj/item/radio/phone(src)
phone_radio = new(src)

unneeded, phone_radio is an implicit type defined by the var, meaning New() doesn't need to be passed a type

phone_radio.keyslot = new
phone_radio.radio_noise = FALSE
phone_radio.canhear_range = 1
Expand Down
3 changes: 3 additions & 0 deletions modular_darkpack/modules/phones/code/phone_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/obj/item/radio/phone/can_receive(input_frequency, list/levels)
return ..(input_frequency, RADIO_NO_Z_LEVEL_RESTRICTION) // without this, phones only work on their own Z level

Comment on lines +1 to +3

@dwinters99 dwinters99 Aug 28, 2026 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(NON-BLOCKING) i was going to ask you to modular comment this, but this is a PR that should go upstream after the testing cycle so i'll just mark this as TM only instead for now. me or @FalloutFalcon will upstream it for you if you don't end up getting around to it.

// Updates the phone's contacts, for when a new contact joins the game.
/obj/item/smartphone/proc/update_contacts()
for(var/datum/contact_network/contact_network as anything in contact_networks)
Expand Down
Loading