From 8fff9eea205a4adac939f1ff8f98e0bda9ddeb59 Mon Sep 17 00:00:00 2001 From: AnonymousHybi Date: Tue, 13 Mar 2018 03:13:19 +0000 Subject: [PATCH 1/3] attempt at fixing travis error --- code/unit_tests/vore_tests_vr.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/unit_tests/vore_tests_vr.dm b/code/unit_tests/vore_tests_vr.dm index e50c50b2fa..6d403cd195 100644 --- a/code/unit_tests/vore_tests_vr.dm +++ b/code/unit_tests/vore_tests_vr.dm @@ -18,6 +18,15 @@ return 1 /datum/unit_test/belly_nonsuffocation/check_result() + + // Jerry rigged cause it seems pred and prey seem to be missing. + pred = create_test_mob() + if(!istype(pred)) + return 0 + prey = create_test_mob(pred.loc) + if(!istype(prey)) + return 0 + // Unfortuantely we need to wait for the pred's belly to initialize. (Currently after a spawn()) if(!pred.vore_organs || !pred.vore_organs.len) return 0 From 5f2329b4ec2abcb7473ab6b6bc98613dcb143ed6 Mon Sep 17 00:00:00 2001 From: AnonymousHybi Date: Tue, 13 Mar 2018 21:20:16 +0000 Subject: [PATCH 2/3] Solved issue where updating sprite didn't check if it was a dogborg. --- code/modules/mob/living/silicon/robot/robot_vr.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 2dd54a1e06..b5a4a81780 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -87,5 +87,7 @@ if((icon_state in vr_icons) && (icon == 'icons/mob/robots.dmi')) original_icon = icon 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 \ No newline at end of file From c642ec1014222488e0e92537ff7b5f974e000586 Mon Sep 17 00:00:00 2001 From: AnonymousHybi Date: Tue, 13 Mar 2018 21:32:20 +0000 Subject: [PATCH 3/3] Disabling unit test to check if people suffocate in stomachs --- code/unit_tests/vore_tests_vr.dm | 9 --------- vorestation.dme | 1 - 2 files changed, 10 deletions(-) diff --git a/code/unit_tests/vore_tests_vr.dm b/code/unit_tests/vore_tests_vr.dm index 6d403cd195..e50c50b2fa 100644 --- a/code/unit_tests/vore_tests_vr.dm +++ b/code/unit_tests/vore_tests_vr.dm @@ -18,15 +18,6 @@ return 1 /datum/unit_test/belly_nonsuffocation/check_result() - - // Jerry rigged cause it seems pred and prey seem to be missing. - pred = create_test_mob() - if(!istype(pred)) - return 0 - prey = create_test_mob(pred.loc) - if(!istype(prey)) - return 0 - // Unfortuantely we need to wait for the pred's belly to initialize. (Currently after a spawn()) if(!pred.vore_organs || !pred.vore_organs.len) return 0 diff --git a/vorestation.dme b/vorestation.dme index c936176298..ed77199f20 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2770,7 +2770,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"