mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-30 15:36:21 +01:00
Merge pull request #13 from AnonymousHybi/master
An attempt at fixing the travis error
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user