TG: - 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.
Revision: r3631
Author: 	 baloh.matevz
This commit is contained in:
Erthilo
2012-05-21 20:31:53 +01:00
parent c84aa96cc4
commit 89aa2d0a90
2 changed files with 72 additions and 6 deletions

View File

@@ -38,14 +38,72 @@
/client/Southwest()
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()
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

View File

@@ -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"