cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Travis fixes.

Browse Source 
sif_ora still runtiming at present. Fix to come when cause is determined.
This commit is contained in:
TheFurryFeline
2020-04-23 15:27:44 -04:00
parent 7666db9f78
commit f4822d2e4f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm
+5 -5
View File
@@ -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)
code/unit_tests/zas_tests.dm
+2 -2
View File
@@ -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"