cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6548 from Meghan-Rossi/upstream-merge-6665

Browse Source 
fix conflict causing compile error
This commit is contained in:
Novacat
2020-02-08 16:03:40 -05:00
committed by GitHub
parent c9e3257d17 22c0fd363f
commit a513230b57
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -6
View File
@@ -46,12 +46,7 @@
// Base icon.
var/cache_key = "[base_icon]-[material.name]"
if(isnull(stool_cache[cache_key]))
<<<<<<< HEAD
var/image/I = image(icon, base_icon) //VOREStation Edit
//var/image/I = image('icons/obj/furniture.dmi', base_icon) //From Polaris Sync. Not sure if this is a better way of doing it or not. Uncomment if so.
=======
var/image/I = image(icon, base_icon)
>>>>>>> 792245a... Merge pull request #6665 from Woodratt/02022020_civilianmaptweak
if(applies_material_colour) //VOREStation Add - Goes with added var
I.color = material.icon_colour
stool_cache[cache_key] = I
@@ -351,4 +346,4 @@
return // Doesn't care about material or anything else.
/obj/structure/bed/alien/attackby(obj/item/weapon/W, mob/user)
return // No deconning.
return // No deconning.