Skip to content

Ports in the Brick Scryerphone from DopplerShift. #859

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
CRITAWAKETS wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ports in the Brick Scryerphone from DopplerShift. #859

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
4 changes: 4 additions & 0 deletions code/__DEFINES/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@
#define INFO_LAYER "layer"
/// Is this item an heirloom item
#define INFO_HEIRLOOM "heirloom"
// NON-MODULE CHANGE START
/// Used to set custom labels on MODlink devices.
#define INFO_MODLINK_LABEL "modlink_label"
// NON-MODULE CHANGE END

// Lipstick styles
#define UPPER_LIP "Upper"
Expand Down
9 changes: 9 additions & 0 deletions code/modules/mod/mod_link.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,10 @@
if(HAS_TRAIT(link_user, TRAIT_IN_CALL))
holder.balloon_alert(user, "already calling!")
return
// NON-MODULE CHANGE START : Custom Modlink Call Logic Overries
if(called.override_called_logic_callback && called.override_called_logic_callback.Invoke(src, user))
return // Early return if our recipient's modlink wants us to.
// NON-MODULE CHANGE END
var/mob/living/link_target = called.get_user_callback.Invoke()
if(!link_target)
holder.balloon_alert(user, "invalid target!")
Expand Down Expand Up @@ -499,6 +503,11 @@
continue
if(!link.can_call_callback.Invoke())
continue
// NON-MODULE CHANGE START : Allow MODlinks to override their displayname.
if(link.visual_name)
callers["[link.visual_name] ([id])"] = id
continue
// NON-MODULE CHANGE END
callers["[link.holder] ([id])"] = id
if(!length(callers))
calling_link.holder.balloon_alert(user, "no targets on freq [calling_link.frequency]!")
Expand Down
4 changes: 4 additions & 0 deletions maplestation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6385,6 +6385,7 @@
#include "maplestation_modules\code\game\objects\effects\temporary_visuals\projectiles\tracer.dm"
#include "maplestation_modules\code\game\objects\items\ashtray.dm"
#include "maplestation_modules\code\game\objects\items\bola.dm"
#include "maplestation_modules\code\game\objects\items\brick_phone_scryer.dm"
#include "maplestation_modules\code\game\objects\items\captain_weapons.dm"
#include "maplestation_modules\code\game\objects\items\cards_ids.dm"
#include "maplestation_modules\code\game\objects\items\cybernetics_paintkit.dm"
Expand Down Expand Up @@ -6727,6 +6728,7 @@
#include "maplestation_modules\code\modules\mob\living\silicon\robot\robot_defines.dm"
#include "maplestation_modules\code\modules\mob\living\simple_animal\noble_cat.dm"
#include "maplestation_modules\code\modules\mob\living\simple_animal\slime.dm"
#include "maplestation_modules\code\modules\mod\mod_link.dm"
#include "maplestation_modules\code\modules\movespeed\modifiers\reagent.dm"
#include "maplestation_modules\code\modules\paperwork\stamps.dm"
#include "maplestation_modules\code\modules\pixel_shift\code\pixel_shift_component.dm"
Expand All @@ -6753,12 +6755,14 @@
#include "maplestation_modules\code\modules\reagents\reagent_containers\cups\glassbottle.dm"
#include "maplestation_modules\code\modules\recycling\holder.dm"
#include "maplestation_modules\code\modules\research\designs\autolathe_designs.dm"
#include "maplestation_modules\code\modules\research\designs\comms_designs.dm"
#include "maplestation_modules\code\modules\research\designs\mecha_designs.dm"
#include "maplestation_modules\code\modules\research\designs\medical_designs.dm"
#include "maplestation_modules\code\modules\research\designs\wiremod_designs.dm"
#include "maplestation_modules\code\modules\research\machinery\experimentor.dm"
#include "maplestation_modules\code\modules\research\techweb\_research.dm"
#include "maplestation_modules\code\modules\research\techweb\all_nodes.dm"
#include "maplestation_modules\code\modules\research\techweb\engi_nodes.dm"
#include "maplestation_modules\code\modules\research\xenobiology\cores.dm"
#include "maplestation_modules\code\modules\research\xenobiology\potions.dm"
#include "maplestation_modules\code\modules\robotic_limb_detach\robot_limb_detach_quirk.dm"
Expand Down
Loading
Loading