diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 8a73ae71680..5b93f7f7df5 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -256,7 +256,7 @@ ________________________________________________________________________________ dat += "

SpiderOS v.ERR-RR00123

" dat += "
" dat += " Current Time: [worldtime2text()]
" - dat += " Battery Life: [round(cell.charge/100)]%
" + dat += " Battery Life: [round(cell.charge)] ([round(cell.charge/100)]%)
" dat += " Smoke Bombs: \Roman [s_bombs]
" dat += " pai Device: " if(pai) @@ -868,7 +868,7 @@ ________________________________________________________________________________ var/mob/living/carbon/human/U = affecting if(s_active) cancel_stealth() - else + else if(!blade_check(U)) anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir) s_active=!s_active icon_state = U.gender==FEMALE ? "s-ninjasf" : "s-ninjas" @@ -879,6 +879,8 @@ ________________________________________________________________________________ for(var/mob/O in oviewers(U)) O.show_message("[U.name] vanishes into thin air!",1) U.invisibility = INVISIBILITY_OBSERVER + else + U << "\red ERROR: \black You cannot cloak with an active energy blade." return /obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth() diff --git a/code/modules/events/tgevents/ninja.dm b/code/modules/events/tgevents/ninja.dm index 2332857e6ba..0d5e1fe167e 100644 --- a/code/modules/events/tgevents/ninja.dm +++ b/code/modules/events/tgevents/ninja.dm @@ -1589,7 +1589,7 @@ ________________________________________________________________________________ dat += "

SpiderOS v.ERR-RR00123

" dat += "
" dat += " Current Time: [worldtime2text()]
" - dat += " Battery Life: [round(cell.charge/100)]%
" + dat += " Battery Life: [round(cell.charge)] ([round(cell.charge/100)]%)
" dat += " Smoke Bombs: \Roman [s_bombs]
" dat += " pai Device: " if(pai) @@ -1722,7 +1722,7 @@ ________________________________________________________________________________ Abilities: