summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--locales/ja-JP.yml1
-rw-r--r--src/client/app/common/scripts/room/furnitures.json54
-rw-r--r--src/client/assets/room/furnitures/energy-drink/energy-drink.blendbin0 -> 724764 bytes
-rw-r--r--src/client/assets/room/furnitures/energy-drink/energy-drink.glbbin0 -> 145836 bytes
-rw-r--r--src/client/assets/room/furnitures/energy-drink/texture.afdesignbin0 -> 824566 bytes
-rw-r--r--src/client/assets/room/furnitures/energy-drink/texture.pngbin0 -> 127510 bytes
-rw-r--r--src/client/assets/room/furnitures/energy-drink/uv.pngbin0 -> 22142 bytes
7 files changed, 5 insertions, 0 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 70192a55c7..4564430863 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2353,3 +2353,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
index b6ddd5c2b8..b469ff5a82 100644
--- 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
new file mode 100644
index 0000000000..65fc41273e
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend
Binary files differ
diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb
new file mode 100644
index 0000000000..7fb1c27836
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb
Binary files differ
diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/src/client/assets/room/furnitures/energy-drink/texture.afdesign
new file mode 100644
index 0000000000..8c117a49b1
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/texture.afdesign
Binary files differ
diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/src/client/assets/room/furnitures/energy-drink/texture.png
new file mode 100644
index 0000000000..484ca0f96f
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/texture.png
Binary files differ
diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/src/client/assets/room/furnitures/energy-drink/uv.png
new file mode 100644
index 0000000000..2a3f20c999
--- /dev/null
+++ b/src/client/assets/room/furnitures/energy-drink/uv.png
Binary files differ