Обновка

Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl

@@ -129,3 +129,7 @@ ent-ADTPlushieFritz = Фицджеральд Эллис
 ent-ADTPlushieAzalia = плюшевая Азалия
     .desc = Мягкая и милая игрушка-блондинка.
     .suffix = { "" }
+
+ent-ADTPlushieSofy = Софи
+    .desc = Милая плюшевая игрушка, так и хочется её обнять.
+    .suffix = { "" }

Resources/Locale/ru-RU/ADT/Objects/Weapons/Guns/Guns.ftl

@@ -60,6 +60,14 @@ ent-ADTWeaponPistolX01 = X-01 Мультифазовый энергетичес
     .desc = Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени.
     .suffix = Пистолет
 
+
+ent-ADTRifleAKsy = АКСу-74
+    .desc = Автомат добравшийся из древних времен, что отличается своей простотой и надежностью. Весьма легок и компактен. Совокупность весомых плюсов в маленьком исполнении.
+    .suffix = { "" }
+
+ent-ADTRifleAKsyIohana = Трофейный АКСу-74 Йохана
+    .desc = Оружие на вид слегка потрепанное, на цевье виднеется несколько насечек.
+
 ent-ADTMagazineRifleFNFAL = Магазин 6.5х39 мм TSF
     .desc = Магазин под патрон 6.5х39 мм, с вместимостью в 20 единиц.
     .suffix = { "" }

Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml

@@ -413,3 +413,14 @@
   - type: Sprite
     sprite: ADT/Objects/Fun/toys.rsi
     state: plushie_azalia
+
+- type: entity
+  parent: BasePlushie
+  id: ADTPlushieSofy
+  name: Sofy plushie
+  description: It looks like a soft and cute blondie.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Fun/toys.rsi
+    state: plushie_sofy
+

Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Rifels/abakan.yml

@@ -121,3 +121,127 @@
       path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
   - type: Item
     size: Large
+
+- type: entity
+  name: АКSy-74
+  parent: BaseItem
+  id: ADTRifleAKsy
+  description: Rifles
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Rifels/aksy.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: ADT/Objects/Weapons/Guns/Rifels/aksy.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineLightRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineLightRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 7
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+      - SemiAuto
+      #- Burst
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
+  - type: Item
+    size: Large
+
+- type: entity
+  name: АКSy-74
+  parent: BaseItem
+  id: ADTRifleAKsyIohana
+  description: Rifles
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: mag-0
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineLightRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineLightRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeRifle
+  - type: ContainerContainer
+    containers:
+      gun_magazine: !type:ContainerSlot
+      gun_chamber: !type:ContainerSlot
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 7.5
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+      - SemiAuto
+      #- Burst
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg
+  - type: Item
+    size: Large

Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json

@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/tree/f83a6bb2ab5623f700d7732a432e7e50f1f4a571; inhand-left, inhand-right, imera, aurora by discord:Van#1931; sisa, slarsha, nukie, rocker, red by discord:SMN - SAY MY NAME, not SeMeN#8129",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/tree/f83a6bb2ab5623f700d7732a432e7e50f1f4a571; inhand-left, inhand-right, imera, aurora by discord:Van#1931; sisa, slarsha, nukie, rocker, red by discord:SMN - SAY MY NAME, not SeMeN#8129",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "plushie_jessie"
@@ -105,6 +105,10 @@
         },
         {
             "name": "plushie_azalia"
+        },
+        {
+            "name": "plushie_sofy"
         }
     ]
 }
+

Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/aksy.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by discord:prazat911 Approved for use ONLY on the Adventure Time project.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by discord:prazat911 Approved for use ONLY on the Adventure Time project.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}