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

Merge branch 'release' of https://github.com/VOREStation/VOREStation into releaseupdate

Browse Source 
# Conflicts:
#	icons/mob/hud.dmi
This commit is contained in:
Repede
2020-03-04 08:17:38 -05:00
parent 03af76bd29 8ec905066a
commit 6e293183ad
26 changed files with 765 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+2 -2
View File
@@ -226,8 +226,8 @@
/obj/structure/bed/chair/sofa/update_icon()
if(applies_material_colour && sofa_material)
material = get_material_by_name(sofa_material)
color = material.icon_colour
var/material/color_material = get_material_by_name(sofa_material)
color = color_material.icon_colour
if(sofa_material == "carpet")
name = "red [initial(name)]"