AdventureTimeSS14 · PyotrIgn · Apr 25, 2024 · Apr 23, 2024 · Apr 24, 2024 · Apr 25, 2024
diff --git a/ADT_STATION b/ADT_STATION
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -80,3 +80,6 @@ research-technology-advanced-anomaly-research = Продвинутые иссл
 research-technology-portable-fission = Эксперементальные батареи
 
 ADT-research-technology-doll-house = Кукольный домик
+ADT-research-technology-gigax = боевой мех "Гайгэкс"
+ADT-research-technology-odysseus = медицинский мех "Одиссей"
+ADT-research-technology-medgun = медиган
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl
@@ -334,3 +334,6 @@ ent-ADTPosterWorkUnderWay = Ведутся работы!
 
 ent-ADTPosterPlasmaMan = Плазма(мены)
     .desc = Плакат рассказывает о желании плазмаменов работать на станциях NT... вместо новакидов...
+
+ent-ADTPosterContrabandRoza = Роза
+    .desc = Символ Атмосии.
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml
@@ -776,3 +776,14 @@
   components:
   - type: Sprite
     state: quadro_electronics
+
+- type: entity
+  parent: ADTPosterBaseKek
+  id: ADTPosterContrabandRoza
+  name: Roza
+  description: "A face of Atmosia."
+  components:
+  - type: Sprite
+    sprite: ADT/Structures/Wallmounts/128x128posters.rsi
+    state: roza
+    scale: 0.25, 0.25
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
@@ -90,7 +90,7 @@
     sprite: Objects/Misc/stock_parts.rsi
     state: advanced_matter_bin
   discipline: Experimental
-  tier: 2
+  tier: 1
   cost: 8500
   recipeUnlocks:
   - CapacitorStockPart

diff --git a/...ures/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/beam_heal.png b/...ures/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/beam_heal.png
diff --git a/...es/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/impact_heal.png b/...es/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/impact_heal.png
diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/meta.json
@@ -0,0 +1,56 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "not_so_big_chungus для Времени Приключений",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "muzzle_heal",
+            "delays": [
+                [
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12
+                ]
+            ]
+        },
+        {
+            "name": "beam_heal",
+            "delays": [
+                [
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12
+                ]
+            ]
+        },
+        {
+            "name": "impact_heal",
+            "delays": [
+                [
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12,
+                    0.12
+                ]
+            ]
+        }
+    ]
+}
diff --git a/...es/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/muzzle_heal.png b/...es/ADT/Objects/Weapons/Guns/Projectiles/medigun_projectiles.rsi/muzzle_heal.png
diff --git a/Resources/Textures/ADT/Structures/Wallmounts/128x128posters.rsi/meta.json b/Resources/Textures/ADT/Structures/Wallmounts/128x128posters.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 128,
+        "y": 128
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "aginimoto, modified by not_so_big_chungus",
+    "states": [
+        {
+            "name": "roza"
+        }
+    ]
+}
diff --git a/Resources/Textures/ADT/Structures/Wallmounts/128x128posters.rsi/roza.png b/Resources/Textures/ADT/Structures/Wallmounts/128x128posters.rsi/roza.png