diff --git a/code/WorkInProgress/Mloc/Shortcuts.dm b/code/WorkInProgress/Mloc/Shortcuts.dm new file mode 100644 index 00000000000..8d537d15830 --- /dev/null +++ b/code/WorkInProgress/Mloc/Shortcuts.dm @@ -0,0 +1,33 @@ +/mob/verb/shortcut_changeintent(var/changeto as num) + set name = "_changeintent" + set hidden = 1 + if(istype(usr,/mob/living/carbon)) + if(changeto == 1) + switch(usr.a_intent) + if("help") + usr.a_intent = "disarm" + usr.hud_used.action_intent.icon_state = "disarm" + if("disarm") + usr.a_intent = "hurt" + usr.hud_used.action_intent.icon_state = "harm" + if("hurt") + usr.a_intent = "grab" + usr.hud_used.action_intent.icon_state = "grab" + if("grab") + usr.a_intent = "help" + usr.hud_used.action_intent.icon_state = "help" + else if(changeto == -1) + switch(usr.a_intent) + if("help") + usr.a_intent = "grab" + usr.hud_used.action_intent.icon_state = "grab" + if("disarm") + usr.a_intent = "help" + usr.hud_used.action_intent.icon_state = "help" + if("hurt") + usr.a_intent = "disarm" + usr.hud_used.action_intent.icon_state = "disarm" + if("grab") + usr.a_intent = "hurt" + usr.hud_used.action_intent.icon_state = "harm" + return \ No newline at end of file diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 8c340f1ba25..a265cd2e1e4 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -293,6 +293,9 @@ /atom/Click(location,control,params) //world << "atom.Click() on [src] by [usr] : src.type is [src.type]" var/list/pram = params2list(params) + if((pram["alt"] != null && pram["ctrl"] != null && pram["left"] != null) && istype(src,/atom/movable)) + src:pull() + return if(pram["ctrl"] != null && pram["left"] != null) src.examine() return diff --git a/interface/skin.dmf b/interface/skin.dmf index 2bc55b414d1..0a20c2a1560 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -59,6 +59,14 @@ macro "macro" name = "CTRL+D" command = "drop-item" is-disabled = false + elem + name = "CTRL+E" + command = "_changeintent 1" + is-disabled = false + elem + name = "CTRL+Q" + command = "_changeintent -1" + is-disabled = false elem name = "CTRL+S" command = "swap-hand"