Merge remote-tracking branch 'origin/Arena_25' into Arena_25

DeltaV-Station · Jan 3, 2025 · fbb4218 · fbb4218
2 parents 3e09d8b + 418c012
commit fbb4218
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 10 deletions.
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/crates.yml
@@ -6,10 +6,10 @@
   - type: Weldable
   - type: ResistLocker
   - type: Icon
-    sprite: DeltaV/Structures/Storage/Crates/livestock_steel.rsi
+    sprite: _DV/Structures/Storage/Crates/livestock_steel.rsi
     state: icon
   - type: Sprite
-    sprite: DeltaV/Structures/Storage/Crates/livestock_steel.rsi
+    sprite: _DV/Structures/Storage/Crates/livestock_steel.rsi
     layers:
     - state: base
     - state: closed
@@ -62,10 +62,10 @@
   - type: LockVisuals
   - type: AccessReader
   - type: Icon
-    sprite: DeltaV/Structures/Storage/Crates/livestock_secure.rsi
+    sprite: _DV/Structures/Storage/Crates/livestock_secure.rsi
     state: icon
   - type: Sprite
-    sprite: DeltaV/Structures/Storage/Crates/livestock_secure.rsi
+    sprite: _DV/Structures/Storage/Crates/livestock_secure.rsi
     layers:
     - state: base
     - state: closed
@@ -94,10 +94,10 @@
   name: reinforced secure plasteel livestock crate
   components:
   - type: Icon
-    sprite: DeltaV/Structures/Storage/Crates/livestock_reinforced.rsi
+    sprite: _DV/Structures/Storage/Crates/livestock_reinforced.rsi
     state: icon
   - type: Sprite
-    sprite: DeltaV/Structures/Storage/Crates/livestock_reinforced.rsi
+    sprite: _DV/Structures/Storage/Crates/livestock_reinforced.rsi
     layers:
     - state: base
     - state: closed
@@ -138,7 +138,7 @@
     thresholds: [75]
     trackAllDamage: true
     damageOverlay:
-      sprite: DeltaV/Structures/Storage/Crates/livestock_reinforced.rsi
+      sprite: _DV/Structures/Storage/Crates/livestock_reinforced.rsi
   - type: Construction
     graph: CrateLivestockSecure
     node: cratelivestocksecurereinforced

diff --git a/Resources/Prototypes/_DV/Recipes/Crafting/crates.yml b/Resources/Prototypes/_DV/Recipes/Crafting/crates.yml
@@ -6,7 +6,7 @@
   targetNode: cratelivestocksteel
   category: construction-category-storage
   description: A plasteel crate for holding livestock.
-  icon: { sprite: DeltaV/Structures/Storage/Crates/livestock_steel.rsi, state: icon }
+  icon: { sprite: _DV/Structures/Storage/Crates/livestock_steel.rsi, state: icon }
   objectType: Structure
 
 - type: construction
@@ -17,7 +17,7 @@
   targetNode: cratelivestocksteelsecure
   category: construction-category-storage
   description: A lockable plasteel crate for holding livestock.
-  icon: { sprite: DeltaV/Structures/Storage/Crates/livestock_secure.rsi, state: icon }
+  icon: { sprite: _DV/Structures/Storage/Crates/livestock_secure.rsi, state: icon }
   objectType: Structure
 
 - type: construction
@@ -28,5 +28,5 @@
   targetNode: cratelivestocksecurereinforced
   category: construction-category-storage
   description: A reinforced and lockable plasteel crate for holding livestock.
-  icon: { sprite: DeltaV/Structures/Storage/Crates/livestock_reinforced.rsi, state: icon }
+  icon: { sprite: _DV/Structures/Storage/Crates/livestock_reinforced.rsi, state: icon }
   objectType: Structure
diff --git a/...stock_reinforced.rsi/DamageOverlay_75.png → ...stock_reinforced.rsi/DamageOverlay_75.png b/...stock_reinforced.rsi/DamageOverlay_75.png → ...stock_reinforced.rsi/DamageOverlay_75.png
diff --git a/.../Crates/livestock_reinforced.rsi/base.png → .../Crates/livestock_reinforced.rsi/base.png b/.../Crates/livestock_reinforced.rsi/base.png → .../Crates/livestock_reinforced.rsi/base.png
diff --git a/...rates/livestock_reinforced.rsi/closed.png → ...rates/livestock_reinforced.rsi/closed.png b/...rates/livestock_reinforced.rsi/closed.png → ...rates/livestock_reinforced.rsi/closed.png
diff --git a/.../Crates/livestock_reinforced.rsi/icon.png → .../Crates/livestock_reinforced.rsi/icon.png b/.../Crates/livestock_reinforced.rsi/icon.png → .../Crates/livestock_reinforced.rsi/icon.png
diff --git a/...rates/livestock_reinforced.rsi/locked.png → ...rates/livestock_reinforced.rsi/locked.png b/...rates/livestock_reinforced.rsi/locked.png → ...rates/livestock_reinforced.rsi/locked.png
diff --git a/...Crates/livestock_reinforced.rsi/meta.json → ...Crates/livestock_reinforced.rsi/meta.json b/...Crates/livestock_reinforced.rsi/meta.json → ...Crates/livestock_reinforced.rsi/meta.json
diff --git a/.../Crates/livestock_reinforced.rsi/open.png → .../Crates/livestock_reinforced.rsi/open.png b/.../Crates/livestock_reinforced.rsi/open.png → .../Crates/livestock_reinforced.rsi/open.png
diff --git a/...tes/livestock_reinforced.rsi/sparking.png → ...tes/livestock_reinforced.rsi/sparking.png b/...tes/livestock_reinforced.rsi/sparking.png → ...tes/livestock_reinforced.rsi/sparking.png
diff --git a/...tes/livestock_reinforced.rsi/unlocked.png → ...tes/livestock_reinforced.rsi/unlocked.png b/...tes/livestock_reinforced.rsi/unlocked.png → ...tes/livestock_reinforced.rsi/unlocked.png
diff --git a/...rates/livestock_reinforced.rsi/welded.png → ...rates/livestock_reinforced.rsi/welded.png b/...rates/livestock_reinforced.rsi/welded.png → ...rates/livestock_reinforced.rsi/welded.png
diff --git a/...rage/Crates/livestock_secure.rsi/base.png → ...rage/Crates/livestock_secure.rsi/base.png b/...rage/Crates/livestock_secure.rsi/base.png → ...rage/Crates/livestock_secure.rsi/base.png
diff --git a/...ge/Crates/livestock_secure.rsi/closed.png → ...ge/Crates/livestock_secure.rsi/closed.png b/...ge/Crates/livestock_secure.rsi/closed.png → ...ge/Crates/livestock_secure.rsi/closed.png
diff --git a/...rage/Crates/livestock_secure.rsi/icon.png → ...rage/Crates/livestock_secure.rsi/icon.png b/...rage/Crates/livestock_secure.rsi/icon.png → ...rage/Crates/livestock_secure.rsi/icon.png
diff --git a/...ge/Crates/livestock_secure.rsi/locked.png → ...ge/Crates/livestock_secure.rsi/locked.png b/...ge/Crates/livestock_secure.rsi/locked.png → ...ge/Crates/livestock_secure.rsi/locked.png
diff --git a/...age/Crates/livestock_secure.rsi/meta.json → ...age/Crates/livestock_secure.rsi/meta.json b/...age/Crates/livestock_secure.rsi/meta.json → ...age/Crates/livestock_secure.rsi/meta.json
diff --git a/...rage/Crates/livestock_secure.rsi/open.png → ...rage/Crates/livestock_secure.rsi/open.png b/...rage/Crates/livestock_secure.rsi/open.png → ...rage/Crates/livestock_secure.rsi/open.png
diff --git a/.../Crates/livestock_secure.rsi/sparking.png → .../Crates/livestock_secure.rsi/sparking.png b/.../Crates/livestock_secure.rsi/sparking.png → .../Crates/livestock_secure.rsi/sparking.png
diff --git a/.../Crates/livestock_secure.rsi/unlocked.png → .../Crates/livestock_secure.rsi/unlocked.png b/.../Crates/livestock_secure.rsi/unlocked.png → .../Crates/livestock_secure.rsi/unlocked.png
diff --git a/...ge/Crates/livestock_secure.rsi/welded.png → ...ge/Crates/livestock_secure.rsi/welded.png b/...ge/Crates/livestock_secure.rsi/welded.png → ...ge/Crates/livestock_secure.rsi/welded.png
diff --git a/...orage/Crates/livestock_steel.rsi/base.png → ...orage/Crates/livestock_steel.rsi/base.png b/...orage/Crates/livestock_steel.rsi/base.png → ...orage/Crates/livestock_steel.rsi/base.png
diff --git a/...age/Crates/livestock_steel.rsi/closed.png → ...age/Crates/livestock_steel.rsi/closed.png b/...age/Crates/livestock_steel.rsi/closed.png → ...age/Crates/livestock_steel.rsi/closed.png
diff --git a/...orage/Crates/livestock_steel.rsi/icon.png → ...orage/Crates/livestock_steel.rsi/icon.png b/...orage/Crates/livestock_steel.rsi/icon.png → ...orage/Crates/livestock_steel.rsi/icon.png
diff --git a/...rage/Crates/livestock_steel.rsi/meta.json → ...rage/Crates/livestock_steel.rsi/meta.json b/...rage/Crates/livestock_steel.rsi/meta.json → ...rage/Crates/livestock_steel.rsi/meta.json
diff --git a/...orage/Crates/livestock_steel.rsi/open.png → ...orage/Crates/livestock_steel.rsi/open.png b/...orage/Crates/livestock_steel.rsi/open.png → ...orage/Crates/livestock_steel.rsi/open.png
diff --git a/...age/Crates/livestock_steel.rsi/welded.png → ...age/Crates/livestock_steel.rsi/welded.png b/...age/Crates/livestock_steel.rsi/welded.png → ...age/Crates/livestock_steel.rsi/welded.png