This commit is contained in:
silicons
2020-07-23 11:48:46 -07:00
parent 95cd7c6571
commit db3f9b4549
2 changed files with 7 additions and 13 deletions

View File

@@ -54,23 +54,17 @@
var/list/modifiers = params2list(params)
if(modifiers["shift"] && modifiers["middle"])
ShiftMiddleClickOn(A)
return
return ShiftMiddleClickOn(A)
if(modifiers["shift"] && modifiers["ctrl"])
CtrlShiftClickOn(A)
return
return CtrlShiftClickOn(A)
if(modifiers["middle"])
MiddleClickOn(A)
return
return MiddleClickOn(A)
if(modifiers["shift"] && (client && client.show_popup_menus || modifiers["right"])) //CIT CHANGE - makes shift-click examine use right click instead of left click in combat mode
ShiftClickOn(A)
return
return ShiftClickOn(A)
if(modifiers["alt"]) // alt and alt-gr (rightalt)
AltClickOn(A)
return
return AltClickOn(A)
if(modifiers["ctrl"])
CtrlClickOn(A)
return
return CtrlClickOn(A)
if(modifiers["right"]) //CIT CHANGE - allows right clicking to perform actions
return RightClickOn(A,params) //CIT CHANGE - ditto

View File

@@ -18,7 +18,7 @@
if(restrained())
DelayNextAction(CLICK_CD_HANDCUFFED)
RestrainedClickOn(A)
return
return TRUE
if(in_throw_mode)
throw_item(A)//todo: make it plausible to lightly toss items via right-click