cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into pupstream-2025-09-07

Browse Source 
# Conflicts:
#	README.md
#	code/__DEFINES/admin.dm
#	code/__DEFINES/melee.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/economy.dm
#	code/datums/components/crafting/crafting.dm
#	code/datums/elements/crusher_loot.dm
#	code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
#	code/modules/clothing/suits/_suits.dm
#	code/modules/escape_menu/leave_body.dm
#	code/modules/jobs/job_types/_job.dm
#	code/modules/mining/equipment/mineral_scanner.dm
#	code/modules/mob/living/living.dm
#	code/modules/plumbing/plumbers/pill_press.dm
#	tgui/packages/tgui/interfaces/Vending.tsx
This commit is contained in:
nevimer
2025-09-07 00:37:52 -04:00
parent f5bbea9cc9 f4360e2da5
commit b348b617a3
362 changed files with 82084 additions and 106117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/keybinding/human.dm
+2 -2
View File
@@ -6,7 +6,7 @@
return ishuman(user.mob)
/datum/keybinding/human/quick_equip
hotkey_keys = list("E")
hotkey_keys = list("R")
name = "quick_equip"
full_name = "Quick equip"
description = "Quickly puts an item in the best slot available"
@@ -21,7 +21,7 @@
return TRUE
/datum/keybinding/human/quick_equip_belt
hotkey_keys = list("ShiftE")
hotkey_keys = list("ShiftR")
name = "quick_equip_belt"
full_name = "Quick equip belt"
description = "Put held thing in belt or take out most recent thing from belt"
code/datums/keybinding/living.dm
+1 -1
View File
@@ -169,7 +169,7 @@
return TRUE
/datum/keybinding/living/toggle_throw_mode
hotkey_keys = list("R", "Southwest") // END
hotkey_keys = list("Southwest") // END
name = "toggle_throw_mode"
full_name = "Toggle throw mode"
description = "Toggle throwing the current item or not."
code/datums/keybinding/mob.dm
+32 -2
View File
@@ -21,7 +21,7 @@
return TRUE
/datum/keybinding/mob/swap_hands
hotkey_keys = list("X")
hotkey_keys = list("Unbound")
name = "swap_hands"
full_name = "Swap hands"
description = ""
@@ -35,6 +35,36 @@
M.swap_hand()
return TRUE
/datum/keybinding/mob/select_hand
var/hand_index = NONE
/datum/keybinding/mob/select_hand/right
hotkey_keys = list("Q")
name = "select_right_hand"
full_name = "Swap to Right Hand"
keybind_signal = COMSIG_KB_MOB_SELECTRIGHTHAND_DOWN
hand_index = RIGHT_HANDS
/datum/keybinding/mob/select_hand/left
hotkey_keys = list("E")
name = "select_left_hand"
full_name = "Swap to Left Hand"
keybind_signal = COMSIG_KB_MOB_SELECTLEFTHAND_DOWN
hand_index = LEFT_HANDS
/datum/keybinding/mob/select_hand/down(client/user, turf/target)
. = ..()
if(.)
return
var/mob/user_mob = user.mob
var/active_hand_set = ceil(user_mob.active_hand_index / 2) - 1 //offset
var/desired_hand_index = hand_index + (2 * active_hand_set)
user_mob.swap_hand(desired_hand_index)
return TRUE
/datum/keybinding/mob/activate_inhand
hotkey_keys = list("Z")
name = "activate_inhand"
@@ -51,7 +81,7 @@
return TRUE
/datum/keybinding/mob/drop_item
hotkey_keys = list("Q")
hotkey_keys = list("X")
name = "drop_item"
full_name = "Drop Item"
description = ""