AdventureTimeSS14 · FaDeOkno · Jan 22, 2025 · Jan 5, 2025 · Jan 5, 2025 · Jan 5, 2025
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -36,6 +36,8 @@
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
+using Content.Shared.Construction.Steps;
+using Content.Shared.Tag;
 
 namespace Content.Shared.Storage.EntitySystems;
 
@@ -61,6 +63,7 @@ public abstract class SharedStorageSystem : EntitySystem
     [Dependency] protected readonly UseDelaySystem UseDelay = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
 
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<StackComponent> _stackQuery;
@@ -824,7 +827,8 @@ public bool CanInsert(
         }
 
         if (_whitelistSystem.IsWhitelistFail(storageComp.Whitelist, insertEnt) ||
-            _whitelistSystem.IsBlacklistPass(storageComp.Blacklist, insertEnt))
+            _whitelistSystem.IsBlacklistPass(storageComp.Blacklist, insertEnt) ||
+            _tag.HasTag(insertEnt, "ADTStorageBlacklist"))  // ADT tweak
         {
             reason = "comp-storage-invalid-container";
             return false;

diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Salvage/equip.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Salvage/equip.ftl
@@ -1,2 +1,5 @@
 ent-ADTJaunter = генератор червоточин
     .desc = Инструмент, создающий нестабильные порталы. Может спасти вас, если вы провалились в дыру.
+
+ent-ADTAdvancedOreBag = промышленная сумка для руды
+    .desc = Улучшенная версия сумки для руды, позволяющая хранить больше материалов. Притягивает руду с чуть большего расстояния.
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Specific/tendril.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Specific/tendril.ftl
@@ -15,3 +15,5 @@ ent-ADTTendrilIcewingWatcher = { ent-ADTTendrilBase }
 
 ent-ADTTendrilMagmawingWatcher = { ent-ADTTendrilBase }
     .desc = { ent-ADTTendrilBase.desc }
+
+tendril-destruction-popup = Земля под шипом обваливается!
diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/crates/necropolis.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/crates/necropolis.ftl
@@ -1,4 +1,4 @@
-ent-ADTCrateNecropolis = суднук некрополя
+ent-ADTCrateNecropolis = сундук некрополя
     .desc = Сундук, состоящий из костей и мяса. Таит внутри себя неизведанные артефакты.
 
 ent-ADTCrateNecropolisHeart = { ent-ADTCrateNecropolis }

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Salvage/advanced_ore_bag.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Salvage/advanced_ore_bag.yml
@@ -0,0 +1,15 @@
+- type: entity
+  name: advanced ore bag
+  id: ADTAdvancedOreBag
+  parent: OreBag
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi
+    state: icon
+  - type: Clothing
+    sprite: ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi
+  - type: Storage
+    grid:
+    - 0,0,11,5
+  - type: MagnetPickup
+    range: 1.5
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Specific/tendril.yml b/Resources/Prototypes/ADT/Entities/Structures/Specific/tendril.yml
@@ -27,6 +27,13 @@
           ADTCrateNecropolisRandom:
             min: 1
             max: 1
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/ADT/SoundGen/destruction_1.ogg
+          radius: 7
+      - !type:PopupBehavior
+        popup: tendril-destruction-popup
+        popupType: MediumCaution
   - type: Physics
     bodyType: Static
   - type: Transform

diff --git a/Resources/Prototypes/ADT/mining_shop.yml b/Resources/Prototypes/ADT/mining_shop.yml
@@ -52,20 +52,22 @@
   entries:
   - id: ClothingBeltSalvageWebbing
     price: 500
-  - id: ClothingOuterHardsuitSalvage
-    price: 3000
+  - id: ADTAdvancedOreBag
+    price: 500
+  - id: ADTWeaponCutter
+    price: 500
+  - id: ADTJaunter
+    price: 900
   - id: ADTClothingOuterArmorMiner
     price: 1000
+  - id: ClothingOuterHardsuitSalvage
+    price: 3000
   - id: ADTClothingOuterArmorMinerHeavy
     price: 3600
   - id: ClothingOuterArmorMinerLight
     price: 4000
-  - id: ADTWeaponCutter
-    price: 500
   - id: ADTClothingJumpBoots
     price: 2500
-  - id: ADTJaunter
-    price: 900
 
 - type: miningShopSection
   id: Upgrades

diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml
@@ -454,5 +454,9 @@
 - type: Tag
   id: PKA
 
+- type: Tag
+  id: ADTStorageBlacklist
+
 - type: Tag
   id: LavaDungeonBloodMiner
+
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -17,6 +17,11 @@
     grid:
     - 0,0,6,3
     maxItemSize: Huge
+    # ADT Start
+    blacklist:
+      tags:
+      - ADTOreBag
+    # ADT End
   - type: ContainerContainer
     containers:
       storagebase: !type:Container

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml
@@ -31,4 +31,5 @@
   - type: Tag
     tags:
     - ADTOreBag
+    - ADTStorageBlacklist
   # ADT tweak end
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag_holding.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag_holding.yml
@@ -5,7 +5,7 @@
   description: A robust bag of holding for salvage billionaires and rich miners alike to carry large amounts of ore. Magnetises any nearby ores when attached to a belt.
   components:
   - type: MagnetPickup
-    range: 2
+    range: 2.5 # ADT tweak: 2 -> 2.5
   - type: Sprite
     sprite: Objects/Specific/Mining/ore_bag_holding.rsi
     state: icon

diff --git a/...es/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/equipped-BELT.png b/...es/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/equipped-BELT.png
diff --git a/Resources/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/icon.png b/Resources/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/icon.png
diff --git a/...rces/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/inhand-left.png b/...rces/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/inhand-left.png
diff --git a/...ces/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/inhand-right.png b/...ces/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/inhand-right.png
diff --git a/Resources/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Salvage/advanced_ore_bag.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from ss220, resprite by unlumination",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ ent-ADTTendrilIcewingWatcher = { ent-ADTTendrilBase }

		ent-ADTTendrilMagmawingWatcher = { ent-ADTTendrilBase }
		.desc = { ent-ADTTendrilBase.desc }

		tendril-destruction-popup = Земля под шипом обваливается!