woops
This commit is contained in:
+6
-12
@@ -54,23 +54,17 @@
|
|||||||
|
|
||||||
var/list/modifiers = params2list(params)
|
var/list/modifiers = params2list(params)
|
||||||
if(modifiers["shift"] && modifiers["middle"])
|
if(modifiers["shift"] && modifiers["middle"])
|
||||||
ShiftMiddleClickOn(A)
|
return ShiftMiddleClickOn(A)
|
||||||
return
|
|
||||||
if(modifiers["shift"] && modifiers["ctrl"])
|
if(modifiers["shift"] && modifiers["ctrl"])
|
||||||
CtrlShiftClickOn(A)
|
return CtrlShiftClickOn(A)
|
||||||
return
|
|
||||||
if(modifiers["middle"])
|
if(modifiers["middle"])
|
||||||
MiddleClickOn(A)
|
return MiddleClickOn(A)
|
||||||
return
|
|
||||||
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
|
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 ShiftClickOn(A)
|
||||||
return
|
|
||||||
if(modifiers["alt"]) // alt and alt-gr (rightalt)
|
if(modifiers["alt"]) // alt and alt-gr (rightalt)
|
||||||
AltClickOn(A)
|
return AltClickOn(A)
|
||||||
return
|
|
||||||
if(modifiers["ctrl"])
|
if(modifiers["ctrl"])
|
||||||
CtrlClickOn(A)
|
return CtrlClickOn(A)
|
||||||
return
|
|
||||||
|
|
||||||
if(modifiers["right"]) //CIT CHANGE - allows right clicking to perform actions
|
if(modifiers["right"]) //CIT CHANGE - allows right clicking to perform actions
|
||||||
return RightClickOn(A,params) //CIT CHANGE - ditto
|
return RightClickOn(A,params) //CIT CHANGE - ditto
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
if(restrained())
|
if(restrained())
|
||||||
DelayNextAction(CLICK_CD_HANDCUFFED)
|
DelayNextAction(CLICK_CD_HANDCUFFED)
|
||||||
RestrainedClickOn(A)
|
RestrainedClickOn(A)
|
||||||
return
|
return TRUE
|
||||||
|
|
||||||
if(in_throw_mode)
|
if(in_throw_mode)
|
||||||
throw_item(A)//todo: make it plausible to lightly toss items via right-click
|
throw_item(A)//todo: make it plausible to lightly toss items via right-click
|
||||||
|
|||||||
Reference in New Issue
Block a user