diff --git a/cinematics/respawn/mechineki/respawnhardcore.cinematic b/cinematics/respawn/mechineki/respawnhardcore.cinematic
new file mode 100644
index 00000000000..1115d6a83b8
--- /dev/null
+++ b/cinematics/respawn/mechineki/respawnhardcore.cinematic
@@ -0,0 +1,208 @@
+{
+ "muteSfx" : true,
+ "muteMusic" : true,
+ "scissor" : false,
+ "letterbox" : false,
+ "panels" : [
+ {
+ "drawables" : [
+ {
+ "image" : "/cinematics/respawn/black.png"
+ }
+ ],
+ "keyframes" : [
+ {
+ "timecode" : 0.00,
+ "zoom" : 500,
+ "alpha" : 1,
+ "position" : [476, 253]
+ },
+ {
+ "timecode" : 11.5,
+ "zoom" : 500,
+ "alpha" : 1,
+ "position" : [476, 253]
+ },
+ {
+ "timecode" : 12,
+ "zoom" : 500,
+ "alpha" : 0,
+ "position" : [476, 253]
+ }
+ ]
+ },
+ {
+ "drawables" : [
+ {
+ "image" : "/cinematics/respawn/esc.png"
+ }
+ ],
+ "keyframes" : [
+ {
+ "timecode" : 0.74995,
+ "zoom" : 0.25,
+ "alpha" : 0,
+ "position" : [900, 30]
+ },
+ {
+ "timecode" : 0.749951,
+ "zoom" : 0.25,
+ "alpha" : 1,
+ "position" : [900, 30]
+ },
+ {
+ "timecode" : 10.5,
+ "zoom" : 0.25,
+ "alpha" : 1,
+ "position" : [900, 30]
+ }
+ ]
+ },
+ {
+ "startTime" : 4.5,
+ "endTime" : 10.5,
+ "drawables" : [
+ ],
+ "fontSize" : 16,
+ "text" : "50% of Pixels Lost",
+ "textPosition" : {
+ "position" : [40, 40],
+ "vAnchor" : "top",
+ "wrapWidth" : 218
+ },
+ "keyframes" : [
+ {
+ "timecode" : 0.0,
+ "alpha" : 1.0,
+ "zoom" : 1.0,
+ "position" : [366.5, 100],
+ "frame" : 0,
+ "textPercentage" : 0
+ },
+ {
+ "timecode" : 0.3,
+ "textPercentage" : 0
+ },
+ {
+ "timecode" : 2.5,
+ "frame" : 8,
+ "textPercentage" : 1
+ }
+ ]
+ },
+ {
+ "drawables" : [
+ {
+ "image" : "/cinematics/respawn/mechineki/layer1.png:"
+ }
+ ],
+ "keyframes" : [
+ {
+ "timecode" : 1.5,
+ "zoom" : 1.5,
+ "alpha" : 0,
+ "frame" : 0,
+ "position" : [478, 253]
+ },
+ {
+ "timecode" : 2.5,
+ "zoom" : 1.5,
+ "alpha" : 1,
+ "frame" : 0,
+ "position" : [478, 253]
+ },
+ {
+ "timecode" : 11,
+ "alpha" : 1,
+ "zoom" : 1.5,
+ "frame" : 93.999
+ },
+ {
+ "timecode" : 11.75,
+ "alpha" : 0,
+ "zoom" : 1.5,
+ "frame" : 93.999
+ }
+ ]
+ },
+ {
+ "avatar" : "fullneutralnude",
+ "keyframes" : [
+ {
+ "timecode" : 3.5,
+ "zoom" : 1.5,
+ "alpha" : 0,
+ "frame" : 0,
+ "position" : [478, 269]
+ },
+ {
+ "timecode" : 4,
+ "zoom" : 1.5,
+ "alpha" : 1,
+ "frame" : 0,
+ "position" : [478, 269]
+ },
+ {
+ "timecode" : 11.25,
+ "zoom" : 1.5,
+ "alpha" : 1,
+ "frame" : 0,
+ "position" : [478, 269]
+ },
+ {
+ "timecode" : 12,
+ "alpha" : 0,
+ "zoom" : 1.5,
+ "frame" : 93.999
+ }
+ ]
+ },
+ {
+ "drawables" : [
+ {
+ "image" : "/cinematics/respawn/mechineki/layer2.png:"
+ }
+ ],
+ "keyframes" : [
+ {
+ "timecode" : 1.5,
+ "zoom" : 1.5,
+ "alpha" : 0,
+ "frame" : 0,
+ "position" : [478, 253]
+ },
+ {
+ "timecode" : 2.5,
+ "zoom" : 1.5,
+ "alpha" : 1,
+ "frame" : 0,
+ "position" : [478, 253]
+ },
+ {
+ "timecode" : 11,
+ "alpha" : 1,
+ "zoom" : 1.5,
+ "frame" : 93.999
+ },
+ {
+ "timecode" : 11.75,
+ "alpha" : 0,
+ "zoom" : 1.5,
+ "frame" : 93.999
+ }
+ ]
+ }
+ ],
+ "audio" : [
+ {
+ "timecode" : 3,
+ "resource" : "/sfx/cinematics/pixels_lost_piano.ogg"
+ },
+ {
+ "timecode" : 5,
+ "endTimecode" : 7,
+ "loops" : -1,
+ "resource" : "/sfx/interface/aichatter1_loop.ogg"
+ }
+ ]
+}
diff --git a/objects/novakid/frontiertub/frontiertubicon.object b/objects/novakid/frontiertub/frontiertub.object
similarity index 58%
rename from objects/novakid/frontiertub/frontiertubicon.object
rename to objects/novakid/frontiertub/frontiertub.object
index 8b4c1abd07d..4e7a2c66016 100644
--- a/objects/novakid/frontiertub/frontiertubicon.object
+++ b/objects/novakid/frontiertub/frontiertub.object
@@ -5,7 +5,7 @@
"description" : "A cozy bath that stands on four brass feet",
"shortdescription" : "Clawfoot Tub",
"race" : "novakid",
- "category" : "decorative",
+ "category" : "furniture",
"price" : 200,
"apexDescription" : "The lip of this bath gives it the look of a teacup.",
@@ -19,10 +19,32 @@
"inventoryIcon" : "frontiertubicon.png",
"orientations" : [
{
- "dualImage" : "frontiertub.png:",
- "imagePosition" : [-16, 0],
+ "image" : "frontiertub.png",
+ "imagePosition" : [0, 0],
+ "direction" : "left",
+ "flipImages" : true,
"spaceScan" : 0.1,
- "anchors" : [ "bottom" ]
+ "anchors" : ["bottom"],
+ "sitPosition" : [-16, 22]
+ },
+ {
+ "image" : "frontiertub.png",
+ "imagePosition" : [0, 0],
+ "direction" : "right",
+ "spaceScan" : 0.1,
+ "anchors" : ["bottom"],
+ "sitPosition" : [16, 22]
}
- ]
+ ],
+
+ "objectType" : "loungeable",
+ "sitFlipDirection" : false,
+ "sitOrientation" : "sit",
+ "sitAngle" : 0,
+ "sitCoverImage" : "/objects/novakid/frontiertub/frontiertubcover.png",
+ "sitEmote" : "happy",
+ "sitStatusEffects" : [
+ "nude"
+ ],
+ "sitEffectEmitters" : [ ]
}
diff --git a/objects/novakid/frontiertub/frontiertubcover.png b/objects/novakid/frontiertub/frontiertubcover.png
new file mode 100644
index 00000000000..2d28a7c21de
Binary files /dev/null and b/objects/novakid/frontiertub/frontiertubcover.png differ