diff --git a/code/__DEFINES/~skyrat_defines/keybindings.dm b/code/__DEFINES/~skyrat_defines/keybindings.dm index ac65f5acdbf..1644ce207f9 100644 --- a/code/__DEFINES/~skyrat_defines/keybindings.dm +++ b/code/__DEFINES/~skyrat_defines/keybindings.dm @@ -1 +1,3 @@ #define COMSIG_KB_MOB_PIXELSHIFT "keybinding_mob_pixelshift" +#define COMSIG_KB_CLIENT_LOOC_DOWN "keybinding_client_looc_down" +#define COMSIG_KB_CLIENT_WHISPER_DOWN "keybinding_client_whisper_down" diff --git a/code/datums/keybinding/living.dm b/code/datums/keybinding/living.dm index 801326f36e7..5e14ced7bb5 100644 --- a/code/datums/keybinding/living.dm +++ b/code/datums/keybinding/living.dm @@ -21,7 +21,8 @@ return TRUE /datum/keybinding/living/look_up - hotkey_keys = list("L") + //hotkey_keys = list("L") //ORIGINAL + hotkey_keys = list("P") //SKYRAT EDIT CHANGE - CUSTOMIZATION name = "look up" full_name = "Look Up" description = "Look up at the next z-level. Only works if directly below open space." diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index bd14ee8cda3..b925057af99 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -952,6 +952,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( winset(src, "default-[REF(key)]", "parent=default;name=[key];command=ooc") if("Me") winset(src, "default-[REF(key)]", "parent=default;name=[key];command=me") + //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION + if("LOOC") + winset(src, "default-[REF(key)]", "parent=default;name=[key];command=looc") + if("Whisper") + winset(src, "default-[REF(key)]", "parent=default;name=[key];command=whisper") + //SKYRAT EDIT END /client/proc/change_view(new_size) if (isnull(new_size)) diff --git a/modular_skyrat/modules/customization/datums/keybinding/communication.dm b/modular_skyrat/modules/customization/datums/keybinding/communication.dm new file mode 100644 index 00000000000..898892f01e3 --- /dev/null +++ b/modular_skyrat/modules/customization/datums/keybinding/communication.dm @@ -0,0 +1,11 @@ +/datum/keybinding/client/communication/looc + hotkey_keys = list("L") + name = "LOOC" + full_name = "Local OOC (LOOC)" + keybind_signal = COMSIG_KB_CLIENT_OOC_DOWN + +/datum/keybinding/client/communication/whisper + hotkey_keys = list("Y") + name = "Whisper" + full_name = "IC Whisper" + keybind_signal = COMSIG_KB_CLIENT_ME_DOWN diff --git a/modular_skyrat/modules/customization/readme.md b/modular_skyrat/modules/customization/readme.md index 5eb248a8a79..463a24acdca 100644 --- a/modular_skyrat/modules/customization/readme.md +++ b/modular_skyrat/modules/customization/readme.md @@ -36,6 +36,8 @@ Re-writes how mutant bodyparts exist and how they're handled. Adds in a per limb ./code/modules/mob/living/carbon/human.dm > /mob/living/carbon/human/revive() > APPENDED ./code/modules/reagents/chemistry/reagents/food_reagents.dm > datum/reagent/consumable/on_mob_life() ./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb + .\code\modules\client.dm > /client/proc/update_special_keybinds() + ./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb ./code/modules/mob/living/carbon/human/species.dm > /datum/species/regenerate_organs() > APPENDED @@ -46,6 +48,7 @@ Re-writes how mutant bodyparts exist and how they're handled. Adds in a per limb ./code/modules/mob/living/carbon/human/species_types/felinid.dm > commented out "mutantears = /obj/item/organ/ears/cat" and "mutant_organs = list(/obj/item/organ/tail/cat)" ./code/modules/mob/living/carbon/human/species.dm > var/list/list/mutant_bodyparts (added typed list type) ./code/_globalvars/lists/flavor_misc.dm > Removed accessory list defines + .\code\datums\keybindings\living.dm > /datum/keybinding/living/look_up > from L to P ./code/modules/surgery/bodyparts/_bodyparts.dm > var/rendered_bp_icon diff --git a/tgstation.dme b/tgstation.dme index 4362ab088ec..066d86f5c08 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3297,6 +3297,7 @@ #include "modular_skyrat\modules\customization\_globalvars\lists.dm" #include "modular_skyrat\modules\customization\datums\dna.dm" #include "modular_skyrat\modules\customization\datums\elements\polychromic.dm" +#include "modular_skyrat\modules\customization\datums\keybinding\communication.dm" #include "modular_skyrat\modules\customization\game\objects\items\balls.dm" #include "modular_skyrat\modules\customization\game\objects\items\storage\rings.dm" #include "modular_skyrat\modules\customization\game\objects\items\tanks\n2_tanks.dm"