Fixed some issues after doing a merge

Main rooms/Balcony.tscn

@@ -7,7 +7,6 @@
 [ext_resource path="res://assets/Backgrounds/balcony.jpg" type="Texture" id=5]
 [ext_resource path="res://Scripts/Movement scripts/Door to living room.gd" type="Script" id=6]
 [ext_resource path="res://Scripts/Other plants.gd" type="Script" id=7]
-[ext_resource path="res://assets/Thesis Clickables/plants.png" type="Texture" id=8]
 
 [sub_resource type="GDScript" id=1]
 script/source = "extends Control
@@ -43,29 +42,30 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 #	pass
 "
 
-[sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 19.9228, 46.1471 )
-
 [sub_resource type="RectangleShape2D" id=3]
-extents = Vector2( 19.9228, 32.1977 )
+extents = Vector2( 15.2784, 49.98 )
+
+[sub_resource type="RectangleShape2D" id=8]
+extents = Vector2( 19.9773, 38.0507 )
+
+[sub_resource type="StreamTexture" id=9]
+flags = 4
+load_path = "res://.import/other plants.png-8902b95d40871e2122cfbd88be258a08.stex"
 
-[sub_resource type="RectangleShape2D" id=5]
-extents = Vector2( 34.6417, 58.7324 )
+[sub_resource type="RectangleShape2D" id=4]
+extents = Vector2( 28.1752, 60.0101 )
 
 [sub_resource type="StreamTexture" id=6]
 flags = 4
 load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.stex"
 
 [sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 19.9228, 51.7686 )
-
-[sub_resource type="RectangleShape2D" id=4]
-extents = Vector2( 15.6685, 16.4124 )
+extents = Vector2( 15.1887, 16.2857 )
 
 [sub_resource type="RectangleShape2D" id=7]
 extents = Vector2( 15.6685, 16.4124 )
 
-[node name="Node2D" type="Node2D"]
+[node name="Node2D3" type="Node2D"]
 
 [node name="BG" type="Sprite" parent="."]
 position = Vector2( 515.248, 303.008 )
@@ -83,12 +83,15 @@ __meta__ = {
 }
 
 [node name="Other plants" type="StaticBody2D" parent="."]
-position = Vector2( 283.344, 247.965 )
+position = Vector2( 276.987, 246.906 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
+script = ExtResource( 7 )
 __meta__ = {
 "_edit_group_": true
 }
+interactable = true
+flavorText = "Great listeners! Terrible conversationalists."
 
 [node name="Hitbox" type="CollisionShape2D" parent="Other plants"]
 position = Vector2( -16.8367, -2.11676 )
@@ -101,54 +104,36 @@ position = Vector2( 0.449585, 0.542709 )
 scale = Vector2( 0.201615, 0.377395 )
 texture = ExtResource( 1 )
 
-[node name="Door to living room" type="StaticBody2D" parent="."]
-position = Vector2( 99.5567, 249.292 )
+[node name="Repotted plants" type="StaticBody2D" parent="."]
+visible = false
+position = Vector2( 371.274, 292.927 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 6 )
+script = ExtResource( 2 )
 __meta__ = {
 "_edit_group_": true
 }
 interactable = true
-flavorText = "Clicked"
 
 [node name="Hitbox" type="CollisionShape2D" parent="Repotted plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 5 )
+shape = SubResource( 8 )
 
 [node name="Sprite" type="Sprite" parent="Repotted plants/Hitbox"]
-position = Vector2( 0.127625, 0.542709 )
-scale = Vector2( 0.201615, 0.325884 )
-texture = ExtResource( 8 )
+position = Vector2( 0.449585, 0.542709 )
+scale = Vector2( 0.201615, 0.377395 )
+texture = SubResource( 9 )
 
-[node name="Pot" type="StaticBody2D" parent="."]
-position = Vector2( 293.251, 463.181 )
+[node name="Door to living room" type="StaticBody2D" parent="."]
+position = Vector2( 146.173, 286.373 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 7 )
+script = ExtResource( 6 )
 __meta__ = {
 "_edit_group_": true
 }
 interactable = true
-flavorText = "Great listeners! Terrible conversationalists."
-
-[node name="Hitbox" type="CollisionShape2D" parent="Pot"]
-position = Vector2( -16.8367, -2.11676 )
-scale = Vector2( 5, 5 )
-shape = SubResource( 2 )
-
-[node name="Sprite" type="Sprite" parent="Pot/Hitbox"]
-position = Vector2( -0.00619507, -0.0649719 )
-scale = Vector2( 0.155235, 0.155235 )
-texture = ExtResource( 3 )
-
-[node name="Door to living room" type="StaticBody2D" parent="."]
-position = Vector2( 104.854, 273.66 )
-scale = Vector2( 0.829244, 0.829244 )
-input_pickable = true
-script = ExtResource( 6 )
-interactable = true
 flavorText = "Clicked"
 
 [node name="Hitbox" type="CollisionShape2D" parent="Door to living room"]
@@ -162,8 +147,29 @@ position = Vector2( 0.574005, 0.358818 )
 scale = Vector2( 0.343423, 0.403654 )
 texture = SubResource( 6 )
 
+[node name="Pot" type="StaticBody2D" parent="."]
+position = Vector2( 344.873, 488.242 )
+scale = Vector2( 0.829244, 0.829244 )
+input_pickable = true
+script = ExtResource( 2 )
+__meta__ = {
+"_edit_group_": true
+}
+retrievable = true
+flavorText = "A pant plot-- I mean... a plant pot."
+
+[node name="Hitbox" type="CollisionShape2D" parent="Pot"]
+position = Vector2( -16.8367, -2.11676 )
+scale = Vector2( 5, 5 )
+shape = SubResource( 2 )
+
+[node name="Sprite" type="Sprite" parent="Pot/Hitbox"]
+position = Vector2( -0.00619507, -0.0649719 )
+scale = Vector2( 0.155235, 0.155235 )
+texture = ExtResource( 3 )
+
 [node name="Nana" type="StaticBody2D" parent="."]
-position = Vector2( 204.277, 524.369 )
+position = Vector2( 424.28, 298.754 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 script = ExtResource( 2 )

Main rooms/Neighbor's balcony.tscn

@@ -21,7 +21,7 @@ extents = Vector2( 29.9076, 43.6202 )
 flags = 4
 load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.stex"
 
-[node name="Node2D" type="Node2D"]
+[node name="Node2D3" type="Node2D"]
 
 [node name="BG" type="Sprite" parent="."]
 visible = false