From: Alekshhh <44923899+Alekshhh@users.noreply.github.com>
Date: Sat, 6 Jan 2024 19:34:11 +0000 (+0200)
Subject: Ore Visual Change (#23618)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a3f40c239e5085084935fc1f4214c9c12bde6ae6;p=space-station-14.git

Ore Visual Change (#23618)

* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d8dad78661cb2511113184ced30d073.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* ore

* banona

* glo

* shadwe
---

diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 2159f3abb2..ae90962523 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -95,6 +95,11 @@
   - type: PhysicalComposition
     materialComposition:
       RawPlasma: 500
+  - type: PointLight
+    radius: 1.2
+    energy: 0.6
+    castShadows: false
+    color: "#e592e7"
 
 - type: entity
   parent: PlasmaOre
@@ -164,6 +169,11 @@
   - type: PhysicalComposition
     materialComposition:
       RawUranium: 500
+  - type: PointLight
+    radius: 1.2
+    energy: 0.8
+    castShadows: false
+    color: "#9be792"
 
 - type: entity
   parent: UraniumOre
@@ -187,6 +197,11 @@
   - type: PhysicalComposition
     materialComposition:
       RawBananium: 500
+  - type: PointLight
+    radius: 1.2
+    energy: 1
+    castShadows: false
+    color: "#eef066"
 
 - type: entity
   parent: BananiumOre
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png b/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png
deleted file mode 100644
index 1664f1a3af..0000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/adamantine.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png b/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png
deleted file mode 100644
index 024045a145..0000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/ammonia.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png
index 72cbecad8a..ec4e716e10 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png and b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/coal.png b/Resources/Textures/Objects/Materials/ore.rsi/coal.png
index d89a0b4766..9a26c1059e 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/coal.png and b/Resources/Textures/Objects/Materials/ore.rsi/coal.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/copper.png b/Resources/Textures/Objects/Materials/ore.rsi/copper.png
deleted file mode 100644
index 1ee4970668..0000000000
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/copper.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/gold.png b/Resources/Textures/Objects/Materials/ore.rsi/gold.png
index b841dde074..2999fb0722 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/gold.png and b/Resources/Textures/Objects/Materials/ore.rsi/gold.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/iron.png b/Resources/Textures/Objects/Materials/ore.rsi/iron.png
index 693963eacb..ec2a56e5bb 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/iron.png and b/Resources/Textures/Objects/Materials/ore.rsi/iron.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index 6cc7ee9938..0751cf76d3 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,18 +1,12 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/210/commits/d188de4d110a4f433ce3d30211be30d8257dc4c3 modified by HoofedEar, bananium made by brainfood1183 (github) for ss14, uranium edited by Alekshhh",
+  "copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
-    {
-      "name": "adamantine"
-    },
-    {
-      "name": "ammonia"
-    },
     {
       "name": "bananium"
     },
@@ -34,9 +28,6 @@
     {
       "name": "silver"
     },
-    {
-      "name": "copper"
-    },
     {
       "name": "coal"
     }
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/plasma.png b/Resources/Textures/Objects/Materials/ore.rsi/plasma.png
index 7b5882364d..f9f77e64fc 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/plasma.png and b/Resources/Textures/Objects/Materials/ore.rsi/plasma.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/silver.png b/Resources/Textures/Objects/Materials/ore.rsi/silver.png
index a8da0b92cc..62a6395fe4 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/silver.png and b/Resources/Textures/Objects/Materials/ore.rsi/silver.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz.png b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz.png
index c615636f9f..f1c949006d 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/spacequartz.png and b/Resources/Textures/Objects/Materials/ore.rsi/spacequartz.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/uranium.png b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png
index 6a6b27db7d..4cab856926 100644
Binary files a/Resources/Textures/Objects/Materials/ore.rsi/uranium.png and b/Resources/Textures/Objects/Materials/ore.rsi/uranium.png differ