From f4822d2e4f0f456188e501189a145102f3bdff3e Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Thu, 23 Apr 2020 15:27:44 -0400 Subject: [PATCH] More Travis fixes. sif_ora still runtiming at present. Fix to come when cause is determined. --- .../structures/stool_bed_chair_nest/chairs_ch.dm | 10 +++++----- code/unit_tests/zas_tests.dm | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm index 416e8b2b71..56ae497c5f 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm @@ -1,6 +1,6 @@ /obj/structure/bed/chair/comfy // Making the premade chairs not have the basic chair visible, sometime make the constructed ones work as well - icon = 'icons/obj/furniture_ch.dmi' + icon = 'icons/obj/furniture_ch.dmi' icon_state = "comfychair" base_icon = "comfychair" @@ -24,14 +24,14 @@ icon_state = "sofacornerOLD" base_icon = "sofacornerOLD" -/obj/structure/bed/chair/sofa/sif_ora/New(var/newloc,var/newmaterial) +/obj/structure/bed/chair/sofa/sif_ora/Initialize(var/newloc,var/newmaterial) ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) -/obj/structure/bed/chair/sofa/left/sif_ora/New(var/newloc,var/newmaterial) +/obj/structure/bed/chair/sofa/left/sif_ora/Initialize(var/newloc,var/newmaterial) ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) -/obj/structure/bed/chair/sofa/right/sif_ora/New(var/newloc,var/newmaterial) +/obj/structure/bed/chair/sofa/right/sif_ora/Initialize(var/newloc,var/newmaterial) ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) -/obj/structure/bed/chair/sofa/corner/sif_ora/New(var/newloc,var/newmaterial) +/obj/structure/bed/chair/sofa/corner/sif_ora/Initialize(var/newloc,var/newmaterial) ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) \ No newline at end of file diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm index 19ce724f6b..544ab29db9 100644 --- a/code/unit_tests/zas_tests.dm +++ b/code/unit_tests/zas_tests.dm @@ -79,11 +79,11 @@ /datum/unit_test/zas_area_test/supply_centcomm name = "ZAS: Supply Shuttle" - area_path = /area/supply //yw edit: path changed + area_path = /area/shuttle/supply //yw edit: path changed //CHOMPStation Edit TFF 23/4/20 - Fix Travis /datum/unit_test/zas_area_test/emergency_shuttle name = "ZAS: Emergency Shuttle" - area_path = /area/shuttle/escape + area_path = /area/shuttle/escape/centcom //CHOMPStation Edit TFF 23/4/20 - Fix Travis /datum/unit_test/zas_area_test/ai_chamber name = "ZAS: AI Chamber"