- Fixed some odd behavior with storage items when you drag-dropped them from the floor without ever picking them up.

- New hotkeys: Delete is the 'stop dragging' button and insert cycles through intents.
- Added some user feedback messages to the drop, throw, stop-dragging and cycle-intents hotkeys.
- Added the hotkeys thing to the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3631 316c924e-a436-60f5-8080-3fe189b3f50e

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)

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)

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)

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

html/changelog.html

@@ -53,6 +53,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<ul class="changes bgimages16">
 		<li class="rscadd"><font color='red'>The new user interface is here. If anything is broken or something should be done differently please post feedback on the forum. <b>Spriters are encouraged to make new sprites for the UI.</b></font></li>
 		<li class="rscadd">When you receive a PDA message, the content is displayed to you if the PDA is located somewhere on your person (so not in your backpack). You will also get a reply button there. This will hopefully make PDA communication easier.</li>
+		<li class="rscadd"><b>New hotkeys!</b> delete is the now the 'stop dragging' hotkey, insert is the 'cycle intents' hotkey.</li>
 	</ul>
 </div>
 

interface/skin.dmf

@@ -4,19 +4,19 @@ macro "macro"
 		command = ".center"
 		is-disabled = false
 	elem 
-		name = "NORTHEAST+REP"
+		name = "NORTHEAST"
 		command = ".northeast"
 		is-disabled = false
 	elem 
-		name = "SOUTHEAST+REP"
+		name = "SOUTHEAST"
 		command = ".southeast"
 		is-disabled = false
 	elem 
-		name = "SOUTHWEST+REP"
+		name = "SOUTHWEST"
 		command = ".southwest"
 		is-disabled = false
 	elem 
-		name = "NORTHWEST+REP"
+		name = "NORTHWEST"
 		command = ".northwest"
 		is-disabled = false
 	elem 
@@ -51,6 +51,14 @@ macro "macro"
 		name = "SOUTH+REP"
 		command = ".south"
 		is-disabled = false
+	elem 
+		name = "INSERT"
+		command = "insert-key-pressed"
+		is-disabled = false
+	elem 
+		name = "DELETE"
+		command = "delete-key-pressed"
+		is-disabled = false
 	elem 
 		name = "CTRL+A"
 		command = "toggle-throw-mode"