diff --git a/Dialogue/Timelines/rumia_rebel_base_1.dtl b/Dialogue/Timelines/rumia_rebel_base_1.dtl
new file mode 100644
index 00000000..a31b42d3
--- /dev/null
+++ b/Dialogue/Timelines/rumia_rebel_base_1.dtl
@@ -0,0 +1,8 @@
+[style name="VN"]
+join Cirno center
+join Rumia center
+Rumia: Hey Cirno, are you sure I cannot eat these people?
+Cirno: I already said you cannot, they've been really nice to me!
+Rumia: Buuuut they look so tasty!! I'm getting hungry you know...
+Cirno: I think that if you ask really nicely they'll let you go on a mission and then you can eat all the evil humans you want.
+Rumia: Really? I'm going to ask right away! Thank you!
diff --git a/Scenes/Maps/RebelBase.tscn b/Scenes/Maps/RebelBase.tscn
index 07ba4902..0adfc9c5 100644
--- a/Scenes/Maps/RebelBase.tscn
+++ b/Scenes/Maps/RebelBase.tscn
@@ -1,20 +1,31 @@
-[gd_scene load_steps=11 format=4 uid="uid://bx31ou6tw3kd1"]
+[gd_scene load_steps=17 format=4 uid="uid://bx31ou6tw3kd1"]
 
 [ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_jpse7"]
 [ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_4hnih"]
 [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="2_m7mag"]
 [ext_resource type="Script" path="res://Scenes/CameraController.gd" id="2_pu05b"]
 [ext_resource type="Script" path="res://Scripts/InventoryManager.cs" id="3_5wmap"]
+[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="3_au7nm"]
 [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="4_js5qv"]
 [ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="4_tlevr"]
 [ext_resource type="Script" path="res://Scenes/CameraTarget.gd" id="5_cjdx6"]
 [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="5_pqyv2"]
+[ext_resource type="Texture2D" uid="uid://bcqgke6dthlrj" path="res://Sprites/Actors/Rumia.png" id="6_8wgb2"]
 [ext_resource type="Script" path="res://Scripts/AlarmManager.cs" id="6_m31cm"]
+[ext_resource type="Script" path="res://Scripts/Activables/ScriptableBase.cs" id="6_tf4ep"]
+[ext_resource type="Script" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="7_u7oae"]
+[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="9_700kw"]
+
+[sub_resource type="Resource" id="Resource_0oces"]
+script = ExtResource("7_u7oae")
+TimelineName = "rumia_rebel_base_1"
+WaitForCompletion = true
 
 [node name="GameScene" type="Node2D" node_paths=PackedStringArray("PlayerSpawnMarker")]
 script = ExtResource("1_jpse7")
 PlayerTemplate = ExtResource("2_4hnih")
 PlayerSpawnMarker = NodePath("PlayerStartPosition")
+WeaponTemplate = ExtResource("3_au7nm")
 
 [node name="Tilemaps" type="Node2D" parent="."]
 
@@ -51,6 +62,18 @@ State = 1
 position = Vector2(47, 496)
 State = 1
 
+[node name="Rumia" type="Node2D" parent="Tilemaps/Actors"]
+position = Vector2(-28, 295)
+script = ExtResource("6_tf4ep")
+Events = Array[Object]([SubResource("Resource_0oces")])
+metadata/_edit_group_ = true
+
+[node name="Sprite2D" type="Sprite2D" parent="Tilemaps/Actors/Rumia"]
+texture = ExtResource("6_8wgb2")
+
+[node name="ControlPad" parent="Tilemaps/Actors/Rumia" node_paths=PackedStringArray("Target") instance=ExtResource("9_700kw")]
+Target = NodePath("..")
+
 [node name="CameraController" type="Camera2D" parent="."]
 script = ExtResource("2_pu05b")
 pixel_snap = false
diff --git a/Scenes/player.tscn b/Scenes/player.tscn
index 8c4d7c07..fe9d943b 100644
--- a/Scenes/player.tscn
+++ b/Scenes/player.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=29 format=3 uid="uid://bghghp5ep4w2j"]
+[gd_scene load_steps=30 format=3 uid="uid://bghghp5ep4w2j"]
 
 [ext_resource type="Script" path="res://Scripts/PlayerMovement.cs" id="1_m27vu"]
 [ext_resource type="Texture2D" uid="uid://la06powu57hu" path="res://Sprites/Cirno_Big.png" id="2_bwf6x"]
 [ext_resource type="PackedScene" uid="uid://b1qnfiuokpvsr" path="res://Scenes/Weapons/bullet.tscn" id="2_ov36d"]
 [ext_resource type="PackedScene" uid="uid://chkpk7erlqajg" path="res://Scenes/Selector.tscn" id="3_8wt6s"]
 [ext_resource type="Script" path="res://addons/smoothing/smoothing_2d.gd" id="4_j4xhu"]
+[ext_resource type="Texture2D" uid="uid://ddwhrlrgj6i00" path="res://Sprites/Actors/Cirno.png" id="5_hq878"]
 [ext_resource type="PackedScene" uid="uid://cfb3nsay84xdb" path="res://Scenes/Weapons/crosshair.tscn" id="6_l43rf"]
 [ext_resource type="Texture2D" uid="uid://bf37ce6jskdel" path="res://Sprites/SmallHitbox.png" id="7_msn8i"]
 [ext_resource type="Script" path="res://Scenes/InteractionController.cs" id="7_uvgjg"]
@@ -18,63 +19,63 @@ size = Vector2(6, 6)
 atlas = ExtResource("2_bwf6x")
 region = Rect2(0, 0, 8, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_pdst4"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(0, 0, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_6tpxx"]
+atlas = ExtResource("5_hq878")
+region = Rect2(0, 0, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_s7dqe"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(0, 0, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_wp7gh"]
+atlas = ExtResource("5_hq878")
+region = Rect2(16, 0, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_irmjj"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(8, 0, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_ke1tg"]
+atlas = ExtResource("5_hq878")
+region = Rect2(0, 0, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_chuua"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(16, 0, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_t8hpb"]
+atlas = ExtResource("5_hq878")
+region = Rect2(32, 0, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_nhxfa"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(0, 32, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_qarhr"]
+atlas = ExtResource("5_hq878")
+region = Rect2(16, 32, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_tnyrl"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(8, 32, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_3cgoj"]
+atlas = ExtResource("5_hq878")
+region = Rect2(0, 32, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_awe4i"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(16, 32, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_3o5ec"]
+atlas = ExtResource("5_hq878")
+region = Rect2(32, 32, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_n0dww"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(0, 48, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_mcevb"]
+atlas = ExtResource("5_hq878")
+region = Rect2(16, 48, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_pq4ul"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(8, 48, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_6voax"]
+atlas = ExtResource("5_hq878")
+region = Rect2(0, 48, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_w3vni"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(16, 48, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_s2loq"]
+atlas = ExtResource("5_hq878")
+region = Rect2(32, 48, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_kg1c7"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(0, 16, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_a8lgq"]
+atlas = ExtResource("5_hq878")
+region = Rect2(16, 16, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_qe0jv"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(8, 16, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_sv6wb"]
+atlas = ExtResource("5_hq878")
+region = Rect2(0, 16, 16, 16)
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_6pgul"]
-atlas = ExtResource("2_bwf6x")
-region = Rect2(16, 16, 8, 16)
+[sub_resource type="AtlasTexture" id="AtlasTexture_taqav"]
+atlas = ExtResource("5_hq878")
+region = Rect2(32, 16, 16, 16)
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_q0rt3"]
 animations = [{
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_pdst4")
+"texture": SubResource("AtlasTexture_6tpxx")
 }],
 "loop": true,
 "name": &"idle",
@@ -82,13 +83,13 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_s7dqe")
+"texture": SubResource("AtlasTexture_wp7gh")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_irmjj")
+"texture": SubResource("AtlasTexture_ke1tg")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_chuua")
+"texture": SubResource("AtlasTexture_t8hpb")
 }],
 "loop": true,
 "name": &"walk_down",
@@ -96,13 +97,13 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_nhxfa")
+"texture": SubResource("AtlasTexture_qarhr")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_tnyrl")
+"texture": SubResource("AtlasTexture_3cgoj")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_awe4i")
+"texture": SubResource("AtlasTexture_3o5ec")
 }],
 "loop": true,
 "name": &"walk_left",
@@ -110,13 +111,13 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_n0dww")
+"texture": SubResource("AtlasTexture_mcevb")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_pq4ul")
+"texture": SubResource("AtlasTexture_6voax")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_w3vni")
+"texture": SubResource("AtlasTexture_s2loq")
 }],
 "loop": true,
 "name": &"walk_right",
@@ -124,13 +125,13 @@ animations = [{
 }, {
 "frames": [{
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_kg1c7")
+"texture": SubResource("AtlasTexture_a8lgq")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_qe0jv")
+"texture": SubResource("AtlasTexture_sv6wb")
 }, {
 "duration": 1.0,
-"texture": SubResource("AtlasTexture_6pgul")
+"texture": SubResource("AtlasTexture_taqav")
 }],
 "loop": true,
 "name": &"walk_up",
@@ -180,7 +181,9 @@ frame = 1
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Smoothing2D" groups=["player_sprite"]]
 y_sort_enabled = true
 sprite_frames = SubResource("SpriteFrames_q0rt3")
-animation = &"walk_left"
+animation = &"walk_up"
+frame = 1
+frame_progress = 0.984651
 
 [node name="Crosshair" parent="Smoothing2D" instance=ExtResource("6_l43rf")]
 z_index = 100
diff --git a/Sprites/Actors/Cirno.aseprite b/Sprites/Actors/Cirno.aseprite
new file mode 100644
index 00000000..8b940359
--- /dev/null
+++ b/Sprites/Actors/Cirno.aseprite
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bc3fdd9abed06ce91a678e656d33723778614600e2ae691e2403dfb9ccf5094
+size 4029
diff --git a/Sprites/Actors/Cirno.gif b/Sprites/Actors/Cirno.gif
new file mode 100644
index 00000000..82a5ed3c
Binary files /dev/null and b/Sprites/Actors/Cirno.gif differ
diff --git a/Sprites/Actors/Cirno.png b/Sprites/Actors/Cirno.png
new file mode 100644
index 00000000..f3047cac
--- /dev/null
+++ b/Sprites/Actors/Cirno.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2341610e5bb28b257774dfbb33b91834653f5372f42a71107f8e964d682716e1
+size 1083
diff --git a/Sprites/Actors/Cirno.png.import b/Sprites/Actors/Cirno.png.import
new file mode 100644
index 00000000..6cb8a272
--- /dev/null
+++ b/Sprites/Actors/Cirno.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ddwhrlrgj6i00"
+path="res://.godot/imported/Cirno.png-aacabeda82e04505f27522043f5f6a75.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Sprites/Actors/Cirno.png"
+dest_files=["res://.godot/imported/Cirno.png-aacabeda82e04505f27522043f5f6a75.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/project.godot b/project.godot
index 7ddd0455..47c32647 100644
--- a/project.godot
+++ b/project.godot
@@ -44,6 +44,7 @@ directories/dtl_directory={
 "computer1": "res://Dialogue/Timelines/computer1.dtl",
 "computer2": "res://Dialogue/Timelines/computer2.dtl",
 "rumia_defeat": "res://Dialogue/Timelines/rumia_defeat.dtl",
+"rumia_rebel_base_1": "res://Dialogue/Timelines/rumia_rebel_base_1.dtl",
 "testintro": "res://Dialogue/Timelines/testintro.dtl",
 "timeline": "res://Dialogue/timeline.dtl"
 }