Merge pull request #143 from SamCroswell/master

Ninja HUD/Messneger Update
This commit is contained in:
ZomgPonies
2014-02-01 16:48:45 -08:00
3 changed files with 15 additions and 0 deletions
@@ -186,6 +186,7 @@ ________________________________________________________________________________
unlock_suit()
break
lock_suit(U,1)//Check for icons.
U.hud_used.human_hud('icons/mob/screen1_NinjaHUD.dmi',"#ffffff",255)
U.regenerate_icons()
U << "\blue Linking neural-net interface...\nPattern \green <B>GREEN</B>\blue, continuing operation."
if(4)
@@ -238,6 +239,8 @@ ________________________________________________________________________________
cancel_stealth()//Shutdowns stealth.
if(4)
U << "\blue Disconnecting neural-net interface...\green<B>Success</B>\blue."
U.hud_used.instantiate()
U.regenerate_icons()
if(5)
U << "\blue Disengaging neural-net interface...\green<B>Success</B>\blue."
if(6)
@@ -558,6 +561,17 @@ ________________________________________________________________________________
P.overlays.Cut()
P.overlays += image('icons/obj/pda.dmi', "pda-r")
var/mob/living/L = null
if(P.loc && isliving(P.loc))
L = P.loc
//Maybe they are a pAI!
else
L = get(P, /mob/living/silicon)
if(L)
L << "\icon[P] <b>Message from [!s_control?(A):"an unknown source"], </b>\"[t]\" (<i>Unable to Reply</i>)"
if("Inject")
if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left.
display_to << "\red Error: the suit cannot perform this function. Out of [href_list["name"]]."
+1
View File
@@ -1017,3 +1017,4 @@ Traitors and the like can also be revived with the previous role mostly intact.
usr << "Random events disabled"
message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1)
feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB