diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 8937259b09..62713bf7fb 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -733,16 +733,16 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl else AICtrlClick(usr) return + } + + // ------- MIDDLE-CLICK ------- + + if(parameters["middle"]){ + if(!isAI(usr)) + MiddleClick(usr) + return } - // ------- MIDDLE-CLICK ------- - - if(parameters["middle"]){ - if(!isAI(usr)) - MiddleClick(usr) - return - } - // ------- THROW ------- if(usr.in_throw_mode) return usr:throw_item(src) diff --git a/code/game/objects/secstorage/secstorage.dm b/code/game/objects/secstorage/secstorage.dm index 95c2d6cfcf..b835f552fe 100644 --- a/code/game/objects/secstorage/secstorage.dm +++ b/code/game/objects/secstorage/secstorage.dm @@ -169,6 +169,7 @@ if (src.locked == 1) return + orient2hud(usr) if ((over_object == usr && ((get_dist(src, usr) <= 1 ||src.locked == 0) || usr.contents.Find(src)))) //|| usr.telekinesis == 1 if (usr.s_active) usr.s_active.close(usr) diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm index 69066d9943..0baac55f92 100644 --- a/code/game/objects/storage/storage.dm +++ b/code/game/objects/storage/storage.dm @@ -193,6 +193,7 @@ /obj/item/weapon/storage/MouseDrop(over_object, src_location, over_location) ..() + orient2hud(usr) if ((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) if (usr.s_active) usr.s_active.close(usr) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 59a04af143..d7dad54b19 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -38,14 +38,72 @@ /client/Southwest() - toggle_throw_mode() + if(iscarbon(usr)) + var/mob/living/carbon/C = usr + if(!C.get_active_hand()) + usr << "\red You have nothing in your hand to throw." + return + toggle_throw_mode() + else + usr << "\red This mob type cannot throw items." return /client/Northwest() - drop_item() + if(iscarbon(usr)) + var/mob/living/carbon/C = usr + if(!C.get_active_hand()) + usr << "\red You have nothing to drop in your hand." + return + drop_item() + else + usr << "\red This mob type cannot drop items." return +//This gets called when you press the insert button. +/client/verb/insert_key_pressed() + set hidden = 1 + + if(!src.mob) + return + var/mob/M = src.mob + if(ishuman(M) || isrobot(usr) || ismonkey(M) || istype(M,/mob/living/carbon/alien/humanoid) || islarva(M)) + switch(M.a_intent) + if("help") + if(issilicon(usr)) + usr.a_intent = "hurt" + usr.hud_used.action_intent.icon_state = "harm" + else + 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") + if(issilicon(usr)) + usr.a_intent = "help" + usr.hud_used.action_intent.icon_state = "help" + else + 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" + usr << "\blue Your intent is now \"[usr.a_intent]\"." + else + usr << "\red This mob type does not use intents." + +//This gets called when you press the delete button. +/client/verb/delete_key_pressed() + set hidden = 1 + + if(!usr.pulling) + usr << "\blue You are not pulling anything." + return + usr.pulling = null /client/verb/swap_hand() set hidden = 1 diff --git a/html/changelog.html b/html/changelog.html index 828b0b9170..7fb20a8088 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,7 @@ should be listed in the changelog upon commit tho. Thanks. -->