AdventureTimeSS14 · PyotrIgn · Nov 13, 2024 · Nov 13, 2024 · Nov 13, 2024
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl
@@ -1,2 +1,4 @@
 ent-ADTDrinkNoStopCan = Банка энергетика NoStop 
     .desc = Натуральный энергетический напиток, в нем нет сахара!
+ent-ADTDrinkBeerCanPack = держатель банок для пива
+    .desc = Служит для удобного хранения сразу нескольких банок пива.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl
@@ -21,3 +21,15 @@ ent-ADTVendingMachineCiviMedVend = ГраждоМед
 
 ent-ADTIceCreamVendInventory = Морожемат
     .desc = Смотри, смотри! Это мороженщик!
+
+ent-ADTVendingMachineSnackFree = Getmore Chocolate Corp
+    .suffix = Бесплатный
+    .desc = Автомат с закусками, предоставленный корпорацией Getmore Chocolate, базирующейся на Марсе.
+
+ent-ADTVendingMachineGamesFree = Безобидные развлечения
+    .suffix = Бесплатный
+    .desc = Выдаёт вещи, которые капитан и глава персонала, скорее всего, не оценят, если вы будете развлекаться с ними вместо своей работы...
+
+ent-ADTVendingMachineCoffeeFree = Лучшие горячие напитки Солнечной
+    .suffix = Бесплатный
+    .desc = Подаются кипящими, чтобы оставались горячими всю смену!
diff --git a/Resources/Prototypes/ADT/Decals/concrete_trim.yml b/Resources/Prototypes/ADT/Decals/concrete_trim.yml
@@ -0,0 +1,6 @@
+- type: decal
+  id: ADTWhiteConcreteTrimBox
+  tags: ["planet", "markings"]
+  sprite:
+    sprite: ADT/Decals/concretetrim.rsi
+    state: whiteconcrete_box
diff --git a/Resources/Prototypes/ADT/Decals/markings.yml b/Resources/Prototypes/ADT/Decals/markings.yml
@@ -0,0 +1,247 @@
+- type: decal
+  id: ADTArrowsWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: arrows_whitescale
+
+- type: decal
+  id: ADTBotWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: bot_whitescale
+
+- type: decal
+  id: ADTBotLeftWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: bot_left_whitescale
+
+- type: decal
+  id: ADTBotRightWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: bot_right_whitescale
+
+- type: decal
+  id: ADTCautionWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: caution_whitescale
+
+- type: decal
+  id: ADTDeliveryWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: delivery_whitescale
+
+- type: decal
+  id: ADTLoadingAreaWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: loading_area_whitescale
+
+- type: decal
+  id: ADTStandClearWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: standclear_whitescale
+
+- type: decal
+  id: ADTWarnBoxWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_box_whitescale
+
+- type: decal
+  id: ADTWarnEndWhitescale
+  showMenu: false
+  tags: ["station", "markings"]
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_end_whitescale
+
+- type: decal
+  id: ADTWarnFullWhitescale
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_full_whitescale
+
+- type: decal
+  id: ADTWarningLineWhitescale
+  showMenu: false
+  tags: ["station", "markings"]
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warningline_whitescale
+
+- type: decal
+  id: ADTWarningLineCornerFlippedWhitescale
+  showMenu: false
+  tags: ["station", "markings"]
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warninglinecorner_flipped_whitescale
+
+- type: decal
+  id: ADTWarnCornerWhitescale
+  showMenu: false
+  tags: ["station", "markings"]
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_whitescale
+
+- type: decal
+  id: ADTWarnCornerFlippedWhitescale
+  showMenu: false
+  tags: ["station", "markings"]
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_flipped_whitescale
+
+- type: decal
+  id: ADTWarnCornerWhitescaleNE
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_whitescale_ne
+
+- type: decal
+  id: ADTWarnCornerWhitescaleNW
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_whitescale_nw
+
+- type: decal
+  id: ADTWarnCornerWhitescaleSE
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_whitescale_se
+
+- type: decal
+  id: ADTWarnCornerWhitescaleSW
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_whitescale_sw
+
+- type: decal
+  id: ADTWarnCornerSmallWhitescaleNE
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_small_whitescale_ne
+
+- type: decal
+  id: ADTWarnCornerSmallWhitescaleNW
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_small_whitescale_nw
+
+- type: decal
+  id: ADTWarnCornerSmallWhitescaleSE
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_small_whitescale_se
+
+- type: decal
+  id: ADTWarnCornerSmallWhitescaleSW
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_corner_small_whitescale_sw
+
+- type: decal
+  id: ADTWarnEndWhitescaleE
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_end_whitescale_e
+
+- type: decal
+  id: ADTWarnEndWhitescaleN
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_end_whitescale_n
+
+- type: decal
+  id: ADTWarnEndWhitescaleS
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_end_whitescale_s
+
+- type: decal
+  id: ADTWarnEndWhitescaleW
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_end_whitescale_w
+
+- type: decal
+  id: ADTWarnLineWhitescaleE
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_line_whitescale_e
+
+- type: decal
+  id: ADTWarnLineWhitescaleN
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_line_whitescale_n
+
+- type: decal
+  id: ADTWarnLineWhitescaleS
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_line_whitescale_s
+
+- type: decal
+  id: ADTWarnLineWhitescaleW
+  tags: ["station", "markings"]
+  defaultCustomColor: true
+  sprite:
+    sprite: ADT/Decals/markings.rsi
+    state: warn_line_whitescale_w
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/diona.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/diona.yml
@@ -1,6 +1,6 @@
 - type: marking
   id: ADTDionaTreePaintOverlay
-  bodyPart: LLeg
+  bodyPart: [ RFoot, LFoot] 
   markingCategory: Overlay
   speciesRestriction: [Diona]
   # coloring:

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -13,3 +13,56 @@
           Quantity: 30
   - type: Sprite
     sprite: ADT/Objects/Consumable/Drinks/nostop.rsi
+
+- type: entity
+  id: ADTDrinkBeerCanPack
+  parent: BaseStorageItem
+  name: 6pack
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Misc/6pack_beer.rsi
+    layers:
+      - state: plastic-thingy
+      - state: 6pack1
+        map: ["6pack1"]
+        visible: false
+      - state: 6pack2
+        map: ["6pack2"]
+        visible: false
+      - state: 6pack3
+        map: ["6pack3"]
+        visible: false
+      - state: 6pack4
+        map: ["6pack4"]
+        visible: false
+      - state: 6pack5
+        map: ["6pack5"]
+        visible: false
+      - state: 6pack6
+        map: ["6pack6"]
+        visible: false
+  - type: Item
+    size: Normal
+  - type: Storage
+    grid:
+    - 0,0,2,3
+    whitelist:
+      tags:
+        - ADTBeerCan
+    hideStackVisualsWhenClosed: false
+  - type: StorageFill
+    contents:
+      - id: DrinkBeerCan
+        amount: 6
+  - type: ItemCounter
+    count:
+      tags: [ADTBeerCan]
+    composite: true
+    layerStates:
+    - 6pack1
+    - 6pack2
+    - 6pack3
+    - 6pack4
+    - 6pack5
+    - 6pack6
+  - type: Appearance