Merge branch 'master' into wideborgs

This commit is contained in:
Verkister
2018-03-01 08:20:31 +02:00
committed by GitHub
13 changed files with 142 additions and 1365 deletions
@@ -87,8 +87,9 @@
/mob/living/silicon/robot/proc/vr_sprite_check()
if(wideborg == TRUE)
return
if((icon_state in vr_icons) && (icon == 'icons/mob/robots.dmi'))
if((!(original_icon == icon)) && (!(icon == 'icons/mob/robots_vr.dmi')))
original_icon = icon
if((icon_state in vr_icons) && (icon == 'icons/mob/robots.dmi'))
icon = 'icons/mob/robots_vr.dmi'
else if(!(icon_state in vr_icons))
icon = original_icon
icon = original_icon