diff --git a/code/game/events/EventProcs/ninja_equipment.dm b/code/game/events/EventProcs/ninja_equipment.dm index 58ebb49e38..25081d117f 100644 --- a/code/game/events/EventProcs/ninja_equipment.dm +++ b/code/game/events/EventProcs/ninja_equipment.dm @@ -873,6 +873,7 @@ ________________________________________________________________________________ U << "\blue You are now invisible to normal detection." for(var/mob/O in oviewers(U)) O.show_message("[U.name] vanishes into thin air!",1) + U.update_clothing() return /obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth() @@ -884,6 +885,7 @@ ________________________________________________________________________________ U << "\blue You are now visible." for(var/mob/O in oviewers(U)) O.show_message("[U.name] appears from thin air!",1) + U.update_clothing() return 1 return 0 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 270a9bfe08..fe7e54a197 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -887,7 +887,7 @@ return src.admin_invis =! src.admin_invis if(src.mob) - mob.rebuild_appearance() + mob.update_clothing() log_admin("[key_name(usr)] has turned their invisibility [src.admin_invis ? "ON" : "OFF"]") message_admins("[key_name_admin(usr)] has turned their invisibility [src.admin_invis ? "ON" : "OFF"]", 1) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9855d9488f..cecb9c9df8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1132,20 +1132,6 @@ break - if(client && client.admin_invis) - invisibility = 100 - else if (shielded == 2) - invisibility = 2 - else - invisibility = 0 - if(targeted_by && target_locked) - clothing_overlays += target_locked - else if(targeted_by) - target_locked = new /obj/effect/target_locked(src) - clothing_overlays += target_locked - else if(!targeted_by && target_locked) - del(target_locked) - if (wear_suit) @@ -1197,6 +1183,21 @@ NinjaStealthMalf() else invisibility = 0 + + if(client && client.admin_invis) + invisibility = 100 + else if (shielded == 2) + invisibility = 2 + else +// invisibility = 0 //This should hopefully be taken care of by the above + if(targeted_by && target_locked) + clothing_overlays += target_locked + else if(targeted_by) + target_locked = new /obj/effect/target_locked(src) + clothing_overlays += target_locked + else if(!targeted_by && target_locked) + del(target_locked) + /* for (var/mob/M in viewers(1, src))//For the love of god DO NOT REFRESH EVERY SECOND - Mport if ((M.client && M.machine == src)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 3874e2b376..86db839b1a 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1567,30 +1567,5 @@ thing.dropped(src) thing.layer = initial(thing.layer) - // Why this stuff was in handle_clothing() is beyond me - var/shielded = 0 - for (var/obj/item/weapon/cloaking_device/S in src) - if (S.active) - shielded = 2 - break - - if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_active) - shielded = 3 - switch(shielded) - if(1) - if(2) - invisibility = 2 - //New stealth. Hopefully doesn't lag too much. /N - if(istype(loc, /turf))//If they are standing on a turf. - AddCamoOverlay(loc)//Overlay camo. - if(3) - if(istype(loc, /turf)) - //Ninjas may flick into view once in a while if they are stealthed. - if(prob(90)) - NinjaStealthActive(loc) - else - NinjaStealthMalf() - else - invisibility = 0 name = get_visible_name() diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html index 6c80d65c64..772ca56b4d 100644 --- a/html/archivedchangelog.html +++ b/html/archivedchangelog.html @@ -1,3 +1,409 @@ \ No newline at end of file +--> +
+

25 May 2012

+

Erthilo updated:

+ +
+ +
+

24 May 2012

+

cib updated:

+ +
+ +
+

23 May 2012

+

CIB updated:

+ +

TG & Erthilo updated:

+ +
+ +
+

22 May 2012

+

cib updated:

+ +

Erthilo updated:

+ +
+ +
+

21 May 2012

+

TG updated:

+ +

SkyMarshal updated:

+ +

Uristqwerty updated:

+ +

Erthilo updated:

+ +
+ +
+

20 May 2012

+

Erthilo updated:

+ +
+ +
+

19 May 2012

+

cib updated:

+ +

TG updated:

+ +
+ +
+

17 May 2012

+

TG updated:

+ +

Erthilo updated:

+ +

Abi79 updated:

+ +

SkyMarshal updated:

+ +
+ +
+

16 May 2012

+

Erthilo updated:

+ +
+ +
+

15 May 2012

+

TG updated:

+ +

Erthilo updated:

+ +
+ +
+

13 May 2012

+

TG updated:

+ +
+ +
+

10 May 2012

+

Erthilo updated:

+ +

TG updated:

+ +
+ +
+

07 May 2012

+

TG updated:

+ +
+ +
+

06 May 2012

+

TG updated:

+ +
+ +
+

05 May 2012

+

Erthilo updated:

+ +
+ +
+

04 May 2012

+

dopeghoti updated:

+ +
+ +
+

03 May 2012

+

TG updated:

+ +
+ +
+

2nd May 2012

+

TG updated:

+ +

Erthilo updated:

+ +
+ +
+

1st May 2012

+

Mloc updated:

+ +

Erthilo updated:

+ +
+ +
+

30th April 2012

+

Mloc updated:

+ +

Erthilo updated:

+ +

TG updated:

+ +
+ +
+

TG

+

29th April 2012 updated:

+ +
\ No newline at end of file diff --git a/html/changelog.html b/html/changelog.html index f5c9f490ca..1e56f5c1cb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -42,7 +42,8 @@ Header Section Code: Abi79, Aryn, Cael_Aislinn, Chinsky, cib, CompactNinja, DopeGhoti, Erthilo, Hawk_v3, Head, Ispil, Lexusjjss, Melonstorm, Miniature, Mloc, SkyMarshal, Spectre, Strumpetplaya, Sunfall, Tastyfish, Uristqwerty
Sprites: Apple_Master, Arcalane, Chinsky, CompactNinja, Deus Dactyl, Erthilo, Flashkirby, Miniature, Xenone
- Thanks To: /tg/ station devs, Goonstation devs, and the original Spacestation 13 devs. Skibiliano for the IRC bot. + Sounds: Aryn
+ Thanks To: /tg/ station, Goonstation, Animus Station, Daedalus, and original Spacestation 13 devs. Skibiliano for the IRC bot. @@ -139,413 +140,6 @@ should be listed in the changelog upon commit though. Thanks. --> -
-

25 May 2012

-

Erthilo updated:

- -
- -
-

24 May 2012

-

cib updated:

- -
- -
-

23 May 2012

-

CIB updated:

- -

TG & Erthilo updated:

- -
- -
-

22 May 2012

-

cib updated:

- -

Erthilo updated:

- -
- -
-

21 May 2012

-

TG updated:

- -

SkyMarshal updated:

- -

Uristqwerty updated:

- -

Erthilo updated:

- -
- -
-

20 May 2012

-

Erthilo updated:

- -
- -
-

19 May 2012

-

cib updated:

- -

TG updated:

- -
- -
-

17 May 2012

-

TG updated:

- -

Erthilo updated:

- -

Abi79 updated:

- -

SkyMarshal updated:

- -
- -
-

16 May 2012

-

Erthilo updated:

- -
- -
-

15 May 2012

-

TG updated:

- -

Erthilo updated:

- -
- -
-

13 May 2012

-

TG updated:

- -
- -
-

10 May 2012

-

Erthilo updated:

- -

TG updated:

- -
- -
-

07 May 2012

-

TG updated:

- -
- -
-

06 May 2012

-

TG updated:

- -
- -
-

05 May 2012

-

Erthilo updated:

- -
- -
-

04 May 2012

-

dopeghoti updated:

- -
- -
-

03 May 2012

-

TG updated:

- -
- -
-

2nd May 2012

-

TG updated:

- -

Erthilo updated:

- -
- -
-

1st May 2012

-

Mloc updated:

- -

Erthilo updated:

- -
- -
-

30th April 2012

-

Mloc updated:

- -

Erthilo updated:

- -

TG updated:

- -
- -
-

TG

-

29th April 2012 updated:

- -
-