From 178d04fdb2f27193848ce2b3b6bcafe185912d15 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 14 Jan 2020 14:17:37 -0500 Subject: [PATCH 1/7] Update unit_test_vr.dm --- code/unit_tests/unit_test_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/unit_tests/unit_test_vr.dm b/code/unit_tests/unit_test_vr.dm index ea4023d7b2..9b346788b7 100644 --- a/code/unit_tests/unit_test_vr.dm +++ b/code/unit_tests/unit_test_vr.dm @@ -19,6 +19,9 @@ return 0 var/mob/living/carbon/human/H = new mobtype(mobloc) + world.log << "Mobloc X,Y,Z: " + mobloc.x + "," + mobloc.y + "," + mobloc.z + world.log << "Mobloc air: " + mobloc.air + world.log << "SSair: " + SSair.state + "," + SSair.times_fired if(with_mind) H.mind_initialize("TestKey[rand(0,10000)]") From 462b1355bc3e4a769c26c045c89a451f56c4319f Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 14 Jan 2020 14:50:48 -0500 Subject: [PATCH 2/7] Update unit_test_vr.dm --- code/unit_tests/unit_test_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/unit_tests/unit_test_vr.dm b/code/unit_tests/unit_test_vr.dm index 9b346788b7..883b2c4693 100644 --- a/code/unit_tests/unit_test_vr.dm +++ b/code/unit_tests/unit_test_vr.dm @@ -6,6 +6,7 @@ var/static/default_mobloc = null /datum/unit_test/proc/create_test_mob(var/turf/mobloc = null, var/mobtype = /mob/living/carbon/human, var/with_mind = FALSE) + world.log << "creating test mob" if(isnull(mobloc)) if(!default_mobloc) for(var/turf/simulated/floor/tiled/T in world) From e6cf715644211aa17a9dcf198bf624428262a0cb Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 14 Jan 2020 15:07:59 -0500 Subject: [PATCH 3/7] Update unit_test_vr.dm --- code/unit_tests/unit_test_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/unit_tests/unit_test_vr.dm b/code/unit_tests/unit_test_vr.dm index 883b2c4693..12d4959260 100644 --- a/code/unit_tests/unit_test_vr.dm +++ b/code/unit_tests/unit_test_vr.dm @@ -20,9 +20,9 @@ return 0 var/mob/living/carbon/human/H = new mobtype(mobloc) - world.log << "Mobloc X,Y,Z: " + mobloc.x + "," + mobloc.y + "," + mobloc.z - world.log << "Mobloc air: " + mobloc.air - world.log << "SSair: " + SSair.state + "," + SSair.times_fired + world.log << "Mobloc X,Y,Z: [mobloc.x], [mobloc.y], [mobloc.z]" + world.log << "Mobloc air: [mobloc.air]" + world.log << "SSair: [SSair.state], [SSair.times_fired]" if(with_mind) H.mind_initialize("TestKey[rand(0,10000)]") From bbda8aa0922d80f5d0a823b6b8dbaa9f00e95c09 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 14 Jan 2020 15:28:44 -0500 Subject: [PATCH 4/7] Update Zone.dm --- code/ZAS/Zone.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/ZAS/Zone.dm b/code/ZAS/Zone.dm index 18c5ab2899..4fdb2edd50 100644 --- a/code/ZAS/Zone.dm +++ b/code/ZAS/Zone.dm @@ -68,6 +68,8 @@ Class Procs: ASSERT(!air_master.has_valid_zone(T)) #endif + if(!istype(T)) + return var/datum/gas_mixture/turf_air = T.return_air() add_tile_air(turf_air) T.zone = src From 562a026577ce50e43b6d8e22190f9a0e77120a71 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 14 Jan 2020 17:10:51 -0500 Subject: [PATCH 5/7] Update unit_test_vr.dm --- code/unit_tests/unit_test_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/unit_tests/unit_test_vr.dm b/code/unit_tests/unit_test_vr.dm index 12d4959260..1d2f406713 100644 --- a/code/unit_tests/unit_test_vr.dm +++ b/code/unit_tests/unit_test_vr.dm @@ -3,7 +3,7 @@ // /datum/unit_test - var/static/default_mobloc = null + var/static/default_mobloc = locate(133,122,2) /datum/unit_test/proc/create_test_mob(var/turf/mobloc = null, var/mobtype = /mob/living/carbon/human, var/with_mind = FALSE) world.log << "creating test mob" From c26ea48cc48285bca1322e2dd86859283ac283ba Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 14 Jan 2020 17:23:07 -0500 Subject: [PATCH 6/7] Squish Runtime Bugs --- code/ZAS/Zone.dm | 2 -- code/unit_tests/unit_test_vr.dm | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/ZAS/Zone.dm b/code/ZAS/Zone.dm index 4fdb2edd50..18c5ab2899 100644 --- a/code/ZAS/Zone.dm +++ b/code/ZAS/Zone.dm @@ -68,8 +68,6 @@ Class Procs: ASSERT(!air_master.has_valid_zone(T)) #endif - if(!istype(T)) - return var/datum/gas_mixture/turf_air = T.return_air() add_tile_air(turf_air) T.zone = src diff --git a/code/unit_tests/unit_test_vr.dm b/code/unit_tests/unit_test_vr.dm index 1d2f406713..8ede60a902 100644 --- a/code/unit_tests/unit_test_vr.dm +++ b/code/unit_tests/unit_test_vr.dm @@ -1,12 +1,11 @@ // // VOREStation extensions to unit test framework. // - +//CHOMPStation Edit 14/1/20 TFF - Bugger you, runtimes. Forces test mobs to spawn at these coords for unit checks. /datum/unit_test var/static/default_mobloc = locate(133,122,2) /datum/unit_test/proc/create_test_mob(var/turf/mobloc = null, var/mobtype = /mob/living/carbon/human, var/with_mind = FALSE) - world.log << "creating test mob" if(isnull(mobloc)) if(!default_mobloc) for(var/turf/simulated/floor/tiled/T in world) @@ -20,9 +19,6 @@ return 0 var/mob/living/carbon/human/H = new mobtype(mobloc) - world.log << "Mobloc X,Y,Z: [mobloc.x], [mobloc.y], [mobloc.z]" - world.log << "Mobloc air: [mobloc.air]" - world.log << "SSair: [SSair.state], [SSair.times_fired]" if(with_mind) H.mind_initialize("TestKey[rand(0,10000)]") From 816a49145cc36b4faf27e19c83b6587c8868e017 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 14 Jan 2020 17:29:23 -0500 Subject: [PATCH 7/7] Appease Travis --- code/modules/integrated_electronics/core/tools.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index 4e76874bc1..2de6d73be8 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -273,9 +273,9 @@ /obj/item/weapon/tool/crowbar, /obj/item/weapon/tool/screwdriver, /obj/item/device/multitool, - /obj/item/device/integrated_electronics/wirer, //CHOMP Edit. - /obj/item/device/integrated_electronics/debugger, //CHOMP Edit. - /obj/item/device/integrated_electronics/detailer, //CHOMP Edit. + /obj/item/device/integrated_electronics/wirer, //CHOMP Edit, + /obj/item/device/integrated_electronics/debugger, //CHOMP Edit, + /obj/item/device/integrated_electronics/detailer, //CHOMP Edit, ) cant_hold = list(/obj/item/weapon/tool/screwdriver/power)