diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index f33229ed26e..03ef264b20f 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -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 GREEN\blue, continuing operation." if(4) @@ -238,6 +239,8 @@ ________________________________________________________________________________ cancel_stealth()//Shutdowns stealth. if(4) U << "\blue Disconnecting neural-net interface...\greenSuccess\blue." + U.hud_used.instantiate() + U.regenerate_icons() if(5) U << "\blue Disengaging neural-net interface...\greenSuccess\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] Message from [!s_control?(A):"an unknown source"], \"[t]\" (Unable to Reply)" + 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"]]." diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c0d3f334e03..4d55178b821 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -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! + diff --git a/icons/mob/screen1_NinjaHUD.dmi b/icons/mob/screen1_NinjaHUD.dmi new file mode 100644 index 00000000000..d509a267687 Binary files /dev/null and b/icons/mob/screen1_NinjaHUD.dmi differ