diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index aabf772a..b310417c 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -480,7 +480,8 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) drawtype = "nodebox", tiles = { "forniture_table_lamp_s"..tilesuffix..".png", - "forniture_standing_lamp"..lampcolor.."_l"..tilesuffix..".png", + "forniture_table_lamp_s"..tilesuffix..".png", + "forniture_standing_lamp"..lampcolor.."_l"..tilesuffix..".png" }, paramtype = "light", node_box = { diff --git a/homedecor/textures/forniture_standing_lamp_blue_l.png b/homedecor/textures/forniture_standing_lamp_blue_l.png index e62651d5..d7718918 100644 Binary files a/homedecor/textures/forniture_standing_lamp_blue_l.png and b/homedecor/textures/forniture_standing_lamp_blue_l.png differ diff --git a/homedecor/textures/forniture_standing_lamp_blue_lh.png b/homedecor/textures/forniture_standing_lamp_blue_lh.png index b8a32d04..63e14290 100644 Binary files a/homedecor/textures/forniture_standing_lamp_blue_lh.png and b/homedecor/textures/forniture_standing_lamp_blue_lh.png differ diff --git a/homedecor/textures/forniture_standing_lamp_blue_ll.png b/homedecor/textures/forniture_standing_lamp_blue_ll.png index e246d5d0..84f1b0e8 100644 Binary files a/homedecor/textures/forniture_standing_lamp_blue_ll.png and b/homedecor/textures/forniture_standing_lamp_blue_ll.png differ diff --git a/homedecor/textures/forniture_standing_lamp_blue_lm.png b/homedecor/textures/forniture_standing_lamp_blue_lm.png index 1fffa71f..332a3041 100644 Binary files a/homedecor/textures/forniture_standing_lamp_blue_lm.png and b/homedecor/textures/forniture_standing_lamp_blue_lm.png differ diff --git a/homedecor/textures/forniture_standing_lamp_blue_lx.png b/homedecor/textures/forniture_standing_lamp_blue_lx.png index cc53f4e8..c68d883d 100644 Binary files a/homedecor/textures/forniture_standing_lamp_blue_lx.png and b/homedecor/textures/forniture_standing_lamp_blue_lx.png differ diff --git a/homedecor/textures/forniture_standing_lamp_green_l.png b/homedecor/textures/forniture_standing_lamp_green_l.png index 423e4737..1603938e 100644 Binary files a/homedecor/textures/forniture_standing_lamp_green_l.png and b/homedecor/textures/forniture_standing_lamp_green_l.png differ diff --git a/homedecor/textures/forniture_standing_lamp_green_lh.png b/homedecor/textures/forniture_standing_lamp_green_lh.png index f3bed9b1..e90b2453 100644 Binary files a/homedecor/textures/forniture_standing_lamp_green_lh.png and b/homedecor/textures/forniture_standing_lamp_green_lh.png differ diff --git a/homedecor/textures/forniture_standing_lamp_green_ll.png b/homedecor/textures/forniture_standing_lamp_green_ll.png index 48a89e3d..acae6991 100644 Binary files a/homedecor/textures/forniture_standing_lamp_green_ll.png and b/homedecor/textures/forniture_standing_lamp_green_ll.png differ diff --git a/homedecor/textures/forniture_standing_lamp_green_lm.png b/homedecor/textures/forniture_standing_lamp_green_lm.png index d3c380d8..c4657e9d 100644 Binary files a/homedecor/textures/forniture_standing_lamp_green_lm.png and b/homedecor/textures/forniture_standing_lamp_green_lm.png differ diff --git a/homedecor/textures/forniture_standing_lamp_green_lx.png b/homedecor/textures/forniture_standing_lamp_green_lx.png index 64d7fa7d..f6470548 100644 Binary files a/homedecor/textures/forniture_standing_lamp_green_lx.png and b/homedecor/textures/forniture_standing_lamp_green_lx.png differ diff --git a/homedecor/textures/forniture_standing_lamp_l.png b/homedecor/textures/forniture_standing_lamp_l.png index 03baf65a..c6a4fd43 100644 Binary files a/homedecor/textures/forniture_standing_lamp_l.png and b/homedecor/textures/forniture_standing_lamp_l.png differ diff --git a/homedecor/textures/forniture_standing_lamp_lh.png b/homedecor/textures/forniture_standing_lamp_lh.png index a4e62e2f..77efa615 100644 Binary files a/homedecor/textures/forniture_standing_lamp_lh.png and b/homedecor/textures/forniture_standing_lamp_lh.png differ diff --git a/homedecor/textures/forniture_standing_lamp_ll.png b/homedecor/textures/forniture_standing_lamp_ll.png index d02d4c60..a82b00b9 100644 Binary files a/homedecor/textures/forniture_standing_lamp_ll.png and b/homedecor/textures/forniture_standing_lamp_ll.png differ diff --git a/homedecor/textures/forniture_standing_lamp_lm.png b/homedecor/textures/forniture_standing_lamp_lm.png index cbfdb3cd..028d6514 100644 Binary files a/homedecor/textures/forniture_standing_lamp_lm.png and b/homedecor/textures/forniture_standing_lamp_lm.png differ diff --git a/homedecor/textures/forniture_standing_lamp_lx.png b/homedecor/textures/forniture_standing_lamp_lx.png index ce551ff4..6d3d4a8b 100644 Binary files a/homedecor/textures/forniture_standing_lamp_lx.png and b/homedecor/textures/forniture_standing_lamp_lx.png differ diff --git a/homedecor/textures/forniture_standing_lamp_pink_l.png b/homedecor/textures/forniture_standing_lamp_pink_l.png index 3497fe95..f5ab7b3a 100644 Binary files a/homedecor/textures/forniture_standing_lamp_pink_l.png and b/homedecor/textures/forniture_standing_lamp_pink_l.png differ diff --git a/homedecor/textures/forniture_standing_lamp_pink_lh.png b/homedecor/textures/forniture_standing_lamp_pink_lh.png index 40fc0a04..576cfae0 100644 Binary files a/homedecor/textures/forniture_standing_lamp_pink_lh.png and b/homedecor/textures/forniture_standing_lamp_pink_lh.png differ diff --git a/homedecor/textures/forniture_standing_lamp_pink_ll.png b/homedecor/textures/forniture_standing_lamp_pink_ll.png index 2333bb2b..1a937622 100644 Binary files a/homedecor/textures/forniture_standing_lamp_pink_ll.png and b/homedecor/textures/forniture_standing_lamp_pink_ll.png differ diff --git a/homedecor/textures/forniture_standing_lamp_pink_lm.png b/homedecor/textures/forniture_standing_lamp_pink_lm.png index a54fbec2..35993418 100644 Binary files a/homedecor/textures/forniture_standing_lamp_pink_lm.png and b/homedecor/textures/forniture_standing_lamp_pink_lm.png differ diff --git a/homedecor/textures/forniture_standing_lamp_pink_lx.png b/homedecor/textures/forniture_standing_lamp_pink_lx.png index 01e76a27..fbebd045 100644 Binary files a/homedecor/textures/forniture_standing_lamp_pink_lx.png and b/homedecor/textures/forniture_standing_lamp_pink_lx.png differ diff --git a/homedecor/textures/forniture_standing_lamp_red_l.png b/homedecor/textures/forniture_standing_lamp_red_l.png index 46b31abb..450b19a2 100644 Binary files a/homedecor/textures/forniture_standing_lamp_red_l.png and b/homedecor/textures/forniture_standing_lamp_red_l.png differ diff --git a/homedecor/textures/forniture_standing_lamp_red_lh.png b/homedecor/textures/forniture_standing_lamp_red_lh.png index 39eb2efd..0c5e5deb 100644 Binary files a/homedecor/textures/forniture_standing_lamp_red_lh.png and b/homedecor/textures/forniture_standing_lamp_red_lh.png differ diff --git a/homedecor/textures/forniture_standing_lamp_red_ll.png b/homedecor/textures/forniture_standing_lamp_red_ll.png index c8727fca..5273e92f 100644 Binary files a/homedecor/textures/forniture_standing_lamp_red_ll.png and b/homedecor/textures/forniture_standing_lamp_red_ll.png differ diff --git a/homedecor/textures/forniture_standing_lamp_red_lm.png b/homedecor/textures/forniture_standing_lamp_red_lm.png index afad2209..b3da888d 100644 Binary files a/homedecor/textures/forniture_standing_lamp_red_lm.png and b/homedecor/textures/forniture_standing_lamp_red_lm.png differ diff --git a/homedecor/textures/forniture_standing_lamp_red_lx.png b/homedecor/textures/forniture_standing_lamp_red_lx.png index 2ad349f5..7746c4b6 100644 Binary files a/homedecor/textures/forniture_standing_lamp_red_lx.png and b/homedecor/textures/forniture_standing_lamp_red_lx.png differ diff --git a/homedecor/textures/forniture_standing_lamp_violet_l.png b/homedecor/textures/forniture_standing_lamp_violet_l.png index e7fade38..42c0fa4c 100644 Binary files a/homedecor/textures/forniture_standing_lamp_violet_l.png and b/homedecor/textures/forniture_standing_lamp_violet_l.png differ diff --git a/homedecor/textures/forniture_standing_lamp_violet_lh.png b/homedecor/textures/forniture_standing_lamp_violet_lh.png index 86fdf4cc..178e0a78 100644 Binary files a/homedecor/textures/forniture_standing_lamp_violet_lh.png and b/homedecor/textures/forniture_standing_lamp_violet_lh.png differ diff --git a/homedecor/textures/forniture_standing_lamp_violet_ll.png b/homedecor/textures/forniture_standing_lamp_violet_ll.png index ebd8b1fd..11ca0fa9 100644 Binary files a/homedecor/textures/forniture_standing_lamp_violet_ll.png and b/homedecor/textures/forniture_standing_lamp_violet_ll.png differ diff --git a/homedecor/textures/forniture_standing_lamp_violet_lm.png b/homedecor/textures/forniture_standing_lamp_violet_lm.png index 8fac508b..3bf36ae6 100644 Binary files a/homedecor/textures/forniture_standing_lamp_violet_lm.png and b/homedecor/textures/forniture_standing_lamp_violet_lm.png differ diff --git a/homedecor/textures/forniture_standing_lamp_violet_lx.png b/homedecor/textures/forniture_standing_lamp_violet_lx.png index 7216078d..438e44de 100644 Binary files a/homedecor/textures/forniture_standing_lamp_violet_lx.png and b/homedecor/textures/forniture_standing_lamp_violet_lx.png differ diff --git a/homedecor/textures/forniture_table_lamp_blue_l.png b/homedecor/textures/forniture_table_lamp_blue_l.png index 138eeee4..de8b5ada 100644 Binary files a/homedecor/textures/forniture_table_lamp_blue_l.png and b/homedecor/textures/forniture_table_lamp_blue_l.png differ diff --git a/homedecor/textures/forniture_table_lamp_blue_lh.png b/homedecor/textures/forniture_table_lamp_blue_lh.png index 467d4468..cc5eda27 100644 Binary files a/homedecor/textures/forniture_table_lamp_blue_lh.png and b/homedecor/textures/forniture_table_lamp_blue_lh.png differ diff --git a/homedecor/textures/forniture_table_lamp_blue_ll.png b/homedecor/textures/forniture_table_lamp_blue_ll.png index b8de6b5e..b4e45655 100644 Binary files a/homedecor/textures/forniture_table_lamp_blue_ll.png and b/homedecor/textures/forniture_table_lamp_blue_ll.png differ diff --git a/homedecor/textures/forniture_table_lamp_blue_lm.png b/homedecor/textures/forniture_table_lamp_blue_lm.png index ecc0c0f6..e4749656 100644 Binary files a/homedecor/textures/forniture_table_lamp_blue_lm.png and b/homedecor/textures/forniture_table_lamp_blue_lm.png differ diff --git a/homedecor/textures/forniture_table_lamp_blue_lx.png b/homedecor/textures/forniture_table_lamp_blue_lx.png index 573909c3..9810dd79 100644 Binary files a/homedecor/textures/forniture_table_lamp_blue_lx.png and b/homedecor/textures/forniture_table_lamp_blue_lx.png differ diff --git a/homedecor/textures/forniture_table_lamp_green_l.png b/homedecor/textures/forniture_table_lamp_green_l.png index 6021377e..bbcd5604 100644 Binary files a/homedecor/textures/forniture_table_lamp_green_l.png and b/homedecor/textures/forniture_table_lamp_green_l.png differ diff --git a/homedecor/textures/forniture_table_lamp_green_lh.png b/homedecor/textures/forniture_table_lamp_green_lh.png index ab6cbc92..3edc6a4f 100644 Binary files a/homedecor/textures/forniture_table_lamp_green_lh.png and b/homedecor/textures/forniture_table_lamp_green_lh.png differ diff --git a/homedecor/textures/forniture_table_lamp_green_ll.png b/homedecor/textures/forniture_table_lamp_green_ll.png index 5acfaeab..b1202875 100644 Binary files a/homedecor/textures/forniture_table_lamp_green_ll.png and b/homedecor/textures/forniture_table_lamp_green_ll.png differ diff --git a/homedecor/textures/forniture_table_lamp_green_lm.png b/homedecor/textures/forniture_table_lamp_green_lm.png index 3bb3ba5c..1974d181 100644 Binary files a/homedecor/textures/forniture_table_lamp_green_lm.png and b/homedecor/textures/forniture_table_lamp_green_lm.png differ diff --git a/homedecor/textures/forniture_table_lamp_green_lx.png b/homedecor/textures/forniture_table_lamp_green_lx.png index 09a83da6..dc4c574f 100644 Binary files a/homedecor/textures/forniture_table_lamp_green_lx.png and b/homedecor/textures/forniture_table_lamp_green_lx.png differ diff --git a/homedecor/textures/forniture_table_lamp_l.png b/homedecor/textures/forniture_table_lamp_l.png index 79736019..96211d50 100644 Binary files a/homedecor/textures/forniture_table_lamp_l.png and b/homedecor/textures/forniture_table_lamp_l.png differ diff --git a/homedecor/textures/forniture_table_lamp_lh.png b/homedecor/textures/forniture_table_lamp_lh.png index 79736019..f96ab6ee 100644 Binary files a/homedecor/textures/forniture_table_lamp_lh.png and b/homedecor/textures/forniture_table_lamp_lh.png differ diff --git a/homedecor/textures/forniture_table_lamp_ll.png b/homedecor/textures/forniture_table_lamp_ll.png index 79736019..1b642e84 100644 Binary files a/homedecor/textures/forniture_table_lamp_ll.png and b/homedecor/textures/forniture_table_lamp_ll.png differ diff --git a/homedecor/textures/forniture_table_lamp_lm.png b/homedecor/textures/forniture_table_lamp_lm.png index 79736019..3ce02c94 100644 Binary files a/homedecor/textures/forniture_table_lamp_lm.png and b/homedecor/textures/forniture_table_lamp_lm.png differ diff --git a/homedecor/textures/forniture_table_lamp_lx.png b/homedecor/textures/forniture_table_lamp_lx.png index 79736019..a3f932e9 100644 Binary files a/homedecor/textures/forniture_table_lamp_lx.png and b/homedecor/textures/forniture_table_lamp_lx.png differ diff --git a/homedecor/textures/forniture_table_lamp_pink_l.png b/homedecor/textures/forniture_table_lamp_pink_l.png index 3c6f17e7..491aed75 100644 Binary files a/homedecor/textures/forniture_table_lamp_pink_l.png and b/homedecor/textures/forniture_table_lamp_pink_l.png differ diff --git a/homedecor/textures/forniture_table_lamp_pink_lh.png b/homedecor/textures/forniture_table_lamp_pink_lh.png index 664aefc5..b64a4c6f 100644 Binary files a/homedecor/textures/forniture_table_lamp_pink_lh.png and b/homedecor/textures/forniture_table_lamp_pink_lh.png differ diff --git a/homedecor/textures/forniture_table_lamp_pink_ll.png b/homedecor/textures/forniture_table_lamp_pink_ll.png index 2086fdb3..107b55fe 100644 Binary files a/homedecor/textures/forniture_table_lamp_pink_ll.png and b/homedecor/textures/forniture_table_lamp_pink_ll.png differ diff --git a/homedecor/textures/forniture_table_lamp_pink_lm.png b/homedecor/textures/forniture_table_lamp_pink_lm.png index ecb6dd47..d9b103c2 100644 Binary files a/homedecor/textures/forniture_table_lamp_pink_lm.png and b/homedecor/textures/forniture_table_lamp_pink_lm.png differ diff --git a/homedecor/textures/forniture_table_lamp_pink_lx.png b/homedecor/textures/forniture_table_lamp_pink_lx.png index 508167da..0c274750 100644 Binary files a/homedecor/textures/forniture_table_lamp_pink_lx.png and b/homedecor/textures/forniture_table_lamp_pink_lx.png differ diff --git a/homedecor/textures/forniture_table_lamp_red_l.png b/homedecor/textures/forniture_table_lamp_red_l.png index e45eab9e..6eb894bf 100644 Binary files a/homedecor/textures/forniture_table_lamp_red_l.png and b/homedecor/textures/forniture_table_lamp_red_l.png differ diff --git a/homedecor/textures/forniture_table_lamp_red_lh.png b/homedecor/textures/forniture_table_lamp_red_lh.png index c538ce48..7b5daa12 100644 Binary files a/homedecor/textures/forniture_table_lamp_red_lh.png and b/homedecor/textures/forniture_table_lamp_red_lh.png differ diff --git a/homedecor/textures/forniture_table_lamp_red_ll.png b/homedecor/textures/forniture_table_lamp_red_ll.png index 2f7fc87c..3ef66970 100644 Binary files a/homedecor/textures/forniture_table_lamp_red_ll.png and b/homedecor/textures/forniture_table_lamp_red_ll.png differ diff --git a/homedecor/textures/forniture_table_lamp_red_lm.png b/homedecor/textures/forniture_table_lamp_red_lm.png index 9c846911..6a4b1e5a 100644 Binary files a/homedecor/textures/forniture_table_lamp_red_lm.png and b/homedecor/textures/forniture_table_lamp_red_lm.png differ diff --git a/homedecor/textures/forniture_table_lamp_red_lx.png b/homedecor/textures/forniture_table_lamp_red_lx.png index f698e0c2..92698276 100644 Binary files a/homedecor/textures/forniture_table_lamp_red_lx.png and b/homedecor/textures/forniture_table_lamp_red_lx.png differ diff --git a/homedecor/textures/forniture_table_lamp_s.png b/homedecor/textures/forniture_table_lamp_s.png index 0150c400..281869f8 100644 Binary files a/homedecor/textures/forniture_table_lamp_s.png and b/homedecor/textures/forniture_table_lamp_s.png differ diff --git a/homedecor/textures/forniture_table_lamp_sh.png b/homedecor/textures/forniture_table_lamp_sh.png index 0150c400..1566d635 100644 Binary files a/homedecor/textures/forniture_table_lamp_sh.png and b/homedecor/textures/forniture_table_lamp_sh.png differ diff --git a/homedecor/textures/forniture_table_lamp_sl.png b/homedecor/textures/forniture_table_lamp_sl.png index 0150c400..f2e0f9d8 100644 Binary files a/homedecor/textures/forniture_table_lamp_sl.png and b/homedecor/textures/forniture_table_lamp_sl.png differ diff --git a/homedecor/textures/forniture_table_lamp_sm.png b/homedecor/textures/forniture_table_lamp_sm.png index 0150c400..19966dfd 100644 Binary files a/homedecor/textures/forniture_table_lamp_sm.png and b/homedecor/textures/forniture_table_lamp_sm.png differ diff --git a/homedecor/textures/forniture_table_lamp_sx.png b/homedecor/textures/forniture_table_lamp_sx.png index 0150c400..9afb916c 100644 Binary files a/homedecor/textures/forniture_table_lamp_sx.png and b/homedecor/textures/forniture_table_lamp_sx.png differ diff --git a/homedecor/textures/forniture_table_lamp_violet_l.png b/homedecor/textures/forniture_table_lamp_violet_l.png index cf20c9c5..23d5c48c 100644 Binary files a/homedecor/textures/forniture_table_lamp_violet_l.png and b/homedecor/textures/forniture_table_lamp_violet_l.png differ diff --git a/homedecor/textures/forniture_table_lamp_violet_lh.png b/homedecor/textures/forniture_table_lamp_violet_lh.png index 2b57d96f..d0d205f1 100644 Binary files a/homedecor/textures/forniture_table_lamp_violet_lh.png and b/homedecor/textures/forniture_table_lamp_violet_lh.png differ diff --git a/homedecor/textures/forniture_table_lamp_violet_ll.png b/homedecor/textures/forniture_table_lamp_violet_ll.png index ce7e808c..06daa7d6 100644 Binary files a/homedecor/textures/forniture_table_lamp_violet_ll.png and b/homedecor/textures/forniture_table_lamp_violet_ll.png differ diff --git a/homedecor/textures/forniture_table_lamp_violet_lm.png b/homedecor/textures/forniture_table_lamp_violet_lm.png index 864fb285..e746ee20 100644 Binary files a/homedecor/textures/forniture_table_lamp_violet_lm.png and b/homedecor/textures/forniture_table_lamp_violet_lm.png differ diff --git a/homedecor/textures/forniture_table_lamp_violet_lx.png b/homedecor/textures/forniture_table_lamp_violet_lx.png index 5cc03184..9887f7c2 100644 Binary files a/homedecor/textures/forniture_table_lamp_violet_lx.png and b/homedecor/textures/forniture_table_lamp_violet_lx.png differ