Merge branch 'walllocker'

Alekshhh · Dec 27, 2023 · 99f6f59 · 99f6f59
2 parents b1e2e4c + d686ec9
commit 99f6f59
Show file tree

Hide file tree

Showing 26 changed files with 1 addition and 1 deletion.
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/atmos_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/atmos_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/black_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/black_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/blue_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/blue_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_open.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_open.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_open.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/gray_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/gray_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/green_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/green_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/locked.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/locked.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/med.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/med.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/med_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/med_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/med_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/med_open.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8",
+  "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/mixed_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/mixed_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/orange_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/orange_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/pink_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/pink_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/red_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/red_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/unlocked.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/unlocked.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/white_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/white_door.png
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/yellow_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/yellow_door.png