Merge pull request #13 from AnonymousHybi/master

An attempt at fixing the travis error
This commit is contained in:
CHOMPstation
2018-03-13 21:28:53 -05:00
committed by GitHub
2 changed files with 2 additions and 1 deletions
@@ -92,5 +92,7 @@
original_icon = icon
if((icon_state in vr_icons) && (icon == 'icons/mob/robots.dmi'))
icon = 'icons/mob/robots_vr.dmi'
else if(dogborg)
icon = 'icons/mob/widerobot_vr.dmi'
else if(!(icon_state in vr_icons))
icon = original_icon
-1
View File
@@ -2785,7 +2785,6 @@
#include "code\unit_tests\research_tests.dm"
#include "code\unit_tests\unit_test.dm"
#include "code\unit_tests\unit_test_vr.dm"
#include "code\unit_tests\vore_tests_vr.dm"
#include "code\unit_tests\zas_tests.dm"
#include "code\unit_tests\integrated_circuits\arithmetic.dm"
#include "code\unit_tests\integrated_circuits\circuits.dm"