[Room] Add energy drink

mei23 · Aug 23, 2019 · aae899c · aae899c
1 parent f1fde9e
commit aae899c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 0 deletions.
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1979,3 +1979,4 @@ room:
     bin: "ゴミ箱"
     cup-noodle: "カップ麺"
     holo-display: "ホログラフィックディスプレイ"
+    energy-drink: "エナジードリンク"
diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5
@@ -381,5 +381,9 @@
 				},
 			},
 		},
+	},
+	{
+		id: 'energy-drink',
+		place: "floor",
 	}
 ]
diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend
diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb
diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/src/client/assets/room/furnitures/energy-drink/texture.afdesign
diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/src/client/assets/room/furnitures/energy-drink/texture.png
diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/src/client/assets/room/furnitures/energy-drink/uv.png