From: Firewars763 <35506916+Firewars763@users.noreply.github.com>
Date: Wed, 12 Mar 2025 22:45:22 +0000 (-0400)
Subject: Add Gold and Coal Rock Anomalies (#34809)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=212bf99688c7cabd0c23907e286179a101fa95b4;p=space-station-14.git

Add Gold and Coal Rock Anomalies (#34809)

* This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both.

* Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time.

* Sorted tags.yml alphabetically this time instead of not doing that.

* Updated Texture Copyright information

* Attempted to fix Merge Conflict

* Added bulb light variants for both yellow and black crystals.
---

diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml
index 1489c26493..a043fe97d6 100644
--- a/Resources/Prototypes/Entities/Effects/mobspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml
@@ -39,6 +39,18 @@
   - type: SpawnOnDespawn
     prototype: MobIronCrab
 
+- type: entity
+  id: MobSpawnCrabCoal
+  parent: MobSpawnCrabQuartz
+  name: mobspawner coalcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/Effects/mobspawn.rsi
+    state: crab_coal
+  - type: SpawnOnDespawn
+    prototype: MobCoalCrab
+
 - type: entity
   id: MobSpawnCrabSilver
   parent: MobSpawnCrabQuartz
@@ -51,6 +63,18 @@
   - type: SpawnOnDespawn
     prototype: MobSilverCrab
 
+- type: entity
+  id: MobSpawnCrabGold
+  parent: MobSpawnCrabQuartz
+  name: mobspawner goldcrab
+  categories: [ HideSpawnMenu, Spawner ]
+  components:
+  - type: Sprite
+    sprite: /Textures/Effects/mobspawn.rsi
+    state: crab_gold
+  - type: SpawnOnDespawn
+    prototype: MobGoldCrab
+
 - type: entity
   id: MobSpawnCrabUranium
   parent: MobSpawnCrabQuartz
diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml
index 44afe80e97..155ef10bb5 100644
--- a/Resources/Prototypes/Entities/Effects/wallspawn.yml
+++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml
@@ -74,6 +74,22 @@
   - type: SpawnOnDespawn
     prototype: AsteroidRockSilver
 
+- type: entity
+  id: WallSpawnAsteroidGoldCrab
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockGoldCrab
+
+- type: entity
+  id: WallSpawnAsteroidGold
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockGold
+
 - type: entity
   id: WallSpawnAsteroidIronCrab
   parent: WallSpawnAsteroid
@@ -88,4 +104,20 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: SpawnOnDespawn
-    prototype: AsteroidRockTin
\ No newline at end of file
+    prototype: AsteroidRockTin
+
+- type: entity
+  id: WallSpawnAsteroidCoalCrab
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockCoalCrab
+
+- type: entity
+  id: WallSpawnAsteroidCoal
+  parent: WallSpawnAsteroid
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SpawnOnDespawn
+    prototype: AsteroidRockCoal
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
index d127093412..40f37c737f 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -22,7 +22,7 @@
     - AnomalyFlora
     - AnomalyShadow
     - AnomalyTech
-    #- AnomalySanta 
+    #- AnomalySanta
     rareChance: 0.3
     rarePrototypes:
     - RandomAnomalyInjectorSpawner
@@ -40,7 +40,9 @@
   - type: RandomSpawner
     prototypes:
     - AnomalyRockIron
+    - AnomalyRockCoal
     - AnomalyRockSilver
+    - AnomalyRockGold
     - AnomalyRockQuartz
     - AnomalyRockUranium
     chance: 1
@@ -69,4 +71,4 @@
     - AnomalyTrapRock
     #- AnomalyTrapSanta
     chance: 1
-  
+
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml
index 84adf28e2d..fccc04b495 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crystal.yml
@@ -16,5 +16,7 @@
         - CrystalOrange
         - CrystalBlue
         - CrystalCyan
+        - CrystalYellow
+        - CrystalBlack
         - CrystalGrey
       chance: 0.7
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index a26b1511dd..1a2c134607 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -157,6 +157,37 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
+- type: entity
+  parent: MobOreCrab
+  id: MobCoalCrab
+  description: An ore crab made from coal.
+  components:
+  - type: Sprite
+    state: coal_crab
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 2.5
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 1.0
+    baseSprintSpeed : 1.5
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          Coal1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
 - type: entity
   parent: MobOreCrab
   id: MobUraniumCrab
@@ -221,6 +252,35 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
+- type: entity
+  parent: MobOreCrab
+  id: MobGoldCrab
+  name: ore crab
+  description: An ore crab made from gold.
+  components:
+  - type: Sprite
+    state: gold_crab
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 5
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          GoldOre1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
 - type: entity
   name: reagent slime
   id: ReagentSlime
diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 47828ed8f5..3b2b441aab 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -73,6 +73,22 @@
       - Trash
       - CrystalBlue
 
+- type: entity
+  parent: ShardCrystalBase
+  name: yellow crystal shard
+  id: ShardCrystalYellow
+  components:
+  - type: Sprite
+    color: "#ffde46"
+  - type: PointLight
+    radius: 2
+    energy: 2.5
+    color: "#ffde46"
+  - type: Tag
+    tags:
+      - Trash
+      - CrystalYellow
+
 - type: entity
   parent: ShardCrystalBase
   id: ShardCrystalOrange
@@ -89,6 +105,22 @@
       - Trash
       - CrystalOrange
 
+- type: entity
+  parent: ShardCrystalBase
+  name: black crystal shard
+  id: ShardCrystalBlack
+  components:
+  - type: Sprite
+    color: "#363636"
+  - type: PointLight
+    radius: 2
+    energy: 2.5
+    color: "#363636"
+  - type: Tag
+    tags:
+      - Trash
+      - CrystalBlack
+
 - type: entity
   parent: ShardCrystalBase
   id: ShardCrystalPink
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 66fec56eeb..29f6b7142c 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -347,6 +347,21 @@
     - id: SheetGlass1
     - id: ShardCrystalBlue
 
+- type: entity
+  parent: BaseLightTubeCrystal
+  name: yellow crystal light tube
+  id: LightTubeCrystalYellow
+  components:
+  - type: LightBulb
+    color: "#ffde46"
+  - type: Construction
+    graph: YellowLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalYellow
+
 - type: entity
   parent: BaseLightTubeCrystal
   name: pink crystal light tube
@@ -377,6 +392,24 @@
     - id: SheetGlass1
     - id: ShardCrystalOrange
 
+- type: entity
+  parent: BaseLightTubeCrystal
+  name: black crystal light tube
+  description: A high power high energy bulb which has a small colored crystal inside. It isn't very bright.
+  id: LightTubeCrystalBlack
+  components:
+  - type: LightBulb
+    color: "#363636"
+    lightEnergy: 1
+    lightRadius: 8
+  - type: Construction
+    graph: BlackLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalBlack
+
 - type: entity
   parent: BaseLightTubeCrystal
   name: red crystal light tube
@@ -454,6 +487,21 @@
     - id: SheetGlass1
     - id: ShardCrystalBlue
 
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: yellow crystal light bulb
+  id: LightBulbCrystalYellow
+  components:
+  - type: LightBulb
+    color: "#ffde46"
+  - type: Construction
+    graph: YellowLightBulb
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalYellow
+
 - type: entity
   parent: BaseLightbulbCrystal
   name: pink crystal light bulb
@@ -484,6 +532,24 @@
     - id: SheetGlass1
     - id: ShardCrystalOrange
 
+- type: entity
+  parent: BaseLightbulbCrystal
+  name: black crystal light bulb
+  description: A high power high energy bulb which has a small colored crystal inside. It isn't very bright.
+  id: LightBulbCrystalBlack
+  components:
+  - type: LightBulb
+    color: "#363636"
+    lightEnergy: 1
+    lightRadius: 8
+  - type: Construction
+    graph: BlackLightBulb
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalBlack
+
 - type: entity
   parent: BaseLightbulbCrystal
   name: red crystal light bulb
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml
index 3e5f9ca18a..d68d163b5e 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml
@@ -140,6 +140,34 @@
                   min: 1
                   max: 2
 
+- type: entity
+  id: CrystalBlack
+  parent: CrystalGreen
+  suffix: black
+  components:
+    - type: Sprite
+      color: "#363636"
+    - type: PointLight
+      radius: 3
+      energy: 3
+      color: "#363636"
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 20
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: GlassBreak
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                ShardCrystalBlack:
+                  min: 1
+                  max: 2
+
 - type: entity
   id: CrystalBlue
   parent: CrystalGreen
@@ -168,6 +196,34 @@
                   min: 1
                   max: 2
 
+- type: entity
+  id: CrystalYellow
+  parent: CrystalGreen
+  suffix: yellow
+  components:
+    - type: Sprite
+      color: "#ffde46"
+    - type: PointLight
+      radius: 3
+      energy: 3
+      color: "#ffde46"
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 20
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: GlassBreak
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                ShardCrystalYellow:
+                  min: 1
+                  max: 2
+
 - type: entity
   id: CrystalCyan
   parent: CrystalGreen
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index baa90189cf..0cfb57dca1 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -564,6 +564,35 @@
     softness: 0.5
     color: "#39a1ff"
 
+- type: entity
+  id: PoweredlightYellow
+  suffix: Yellow
+  parent: Poweredlight
+  components:
+  - type: PoweredLight
+    hasLampOnSpawn: LightTubeCrystalYellow
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ffde46"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
+
+- type: entity
+  id: AlwaysPoweredlightYellow
+  suffix: Always Powered, Yellow
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ffde46"
+
 - type: entity
   id: PoweredlightPink
   suffix: Pink
@@ -622,6 +651,36 @@
     softness: 0.5
     color: "#ff8227"
 
+- type: entity
+  id: PoweredlightBlack
+  suffix: Black
+  parent: Poweredlight
+  description:
+  components:
+  - type: PoweredLight
+    hasLampOnSpawn: LightTubeCrystalBlack
+  - type: PointLight
+    radius: 8
+    energy: 1
+    softness: 0.5
+    color: "#363636"
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
+
+- type: entity
+  id: AlwaysPoweredlightBlack
+  suffix: Always Powered, Black
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 1
+    softness: 0.5
+    color: "#363636"
+
 - type: entity
   id: PoweredlightRed
   suffix: Red
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 60980cb6fc..09bf879ca8 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -553,6 +553,56 @@
       spawns:
       - MobSpawnCrabSilver
 
+- type: entity
+  id: AnomalyRockGold
+  parent: AnomalyRockBase
+  suffix: Rock, Gold
+  components:
+  - type: Sprite
+    color: "#e3ba70"
+  - type: PointLight
+    radius: 2.0
+    energy: 7.5
+    color: "#e3ba70"
+  - type: EntitySpawnAnomaly
+    entries:
+    - settings:
+        spawnOnPulse: true
+        minAmount: 8
+        maxAmount: 15
+        minRange: 4.5
+        maxRange: 7.5
+      spawns:
+      - WallSpawnAsteroid
+      - WallSpawnAsteroid
+      - WallSpawnAsteroidGold
+      - WallSpawnAsteroidGoldCrab
+    - settings:
+        spawnOnPulse: true
+        maxAmount: 3
+        minRange: 2.5
+        maxRange: 4.5
+      spawns:
+      - CrystalYellow
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 30
+        maxAmount: 40
+        minRange: 5
+        maxRange: 15
+      spawns:
+      - CrystalYellow
+      - WallSpawnAsteroid
+      - WallSpawnAsteroid
+      - WallSpawnAsteroidGoldCrab
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 6
+        maxAmount: 10
+        maxRange: 5
+      spawns:
+      - MobSpawnCrabGold
+
 - type: entity
   id: AnomalyRockIron
   parent: AnomalyRockBase
@@ -603,6 +653,56 @@
       spawns:
       - MobSpawnCrabIron
 
+- type: entity
+  id: AnomalyRockCoal
+  parent: AnomalyRockBase
+  suffix: Rock, Coal
+  components:
+  - type: Sprite
+    color: "#484848"
+  - type: PointLight
+    radius: 2.0
+    energy: 7.5
+    color: "#484848"
+  - type: EntitySpawnAnomaly
+    entries:
+    - settings:
+        spawnOnPulse: true
+        minAmount: 8
+        maxAmount: 15
+        minRange: 4.5
+        maxRange: 7.5
+      spawns:
+      - WallSpawnAsteroid
+      - WallSpawnAsteroid
+      - WallSpawnAsteroidCoal
+      - WallSpawnAsteroidCoalCrab
+    - settings:
+        spawnOnPulse: true
+        maxAmount: 3
+        minRange: 2.5
+        maxRange: 4.5
+      spawns:
+      - CrystalBlack
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 30
+        maxAmount: 40
+        minRange: 5
+        maxRange: 15
+      spawns:
+      - CrystalBlack
+      - WallSpawnAsteroid
+      - WallSpawnAsteroid
+      - WallSpawnAsteroidCoalCrab
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 6
+        maxAmount: 10
+        maxRange: 5
+      spawns:
+      - MobSpawnCrabCoal
+
 - type: entity
   id: AnomalyFlora
   parent: BaseAnomaly
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 54f553ab9c..e83b4c5f07 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -73,6 +73,29 @@
         - state: rock_coal
           map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
+- type: entity
+  id: AsteroidRockCoalCrab
+  parent: AsteroidRock
+  description: An ore vein rich with coal.
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrab
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_coal
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
 - type: entity
   id: AsteroidRockGold
   parent: AsteroidRock
@@ -96,6 +119,29 @@
         - state: rock_gold
           map: [ "enum.MiningScannerVisualLayers.Overlay" ]
 
+- type: entity
+  id: AsteroidRockGoldCrab
+  parent: AsteroidRock
+  description: An ore vein rich with gold.
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrab
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_gold
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
 - type: entity
   id: AsteroidRockDiamond
   parent: AsteroidRock
diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml
index 588d95f40d..d630ebad48 100644
--- a/Resources/Prototypes/Procedural/biome_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_templates.yml
@@ -513,7 +513,9 @@
         - CrystalGreen
         - CrystalPink
         - CrystalOrange
+        - CrystalBlack
         - CrystalBlue
+        - CrystalYellow
         - CrystalCyan
     - !type:BiomeEntityLayer
       threshold: 0.95
@@ -561,7 +563,9 @@
         - CrystalGreen
         - CrystalPink
         - CrystalOrange
+        - CrystalBlack
         - CrystalBlue
+        - CrystalYellow
         - CrystalCyan
     - !type:BiomeEntityLayer
       threshold: 0.95
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
index d7e48b6646..ef461eda9b 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
@@ -39,6 +39,26 @@
     - node: icon
       entity: LightTubeCrystalBlue
 
+- type: constructionGraph
+  id: YellowLight
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 1
+              doAfter: 1
+            - tag: CrystalYellow
+              name: yellow crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+              doAfter: 1
+    - node: icon
+      entity: LightTubeCrystalYellow
+
 - type: constructionGraph
   id: PinkLight
   start: start
@@ -79,6 +99,26 @@
     - node: icon
       entity: LightTubeCrystalOrange
 
+- type: constructionGraph
+  id: BlackLight
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 1
+              doAfter: 1
+            - tag: CrystalBlack
+              name: black crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+              doAfter: 1
+    - node: icon
+      entity: LightTubeCrystalBlack
+
 - type: constructionGraph
   id: RedLight
   start: start
@@ -160,6 +200,26 @@
   - node: icon
     entity: LightBulbCrystalBlue
 
+- type: constructionGraph
+  id: YellowLightBulb
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - material: Glass
+        amount: 1
+        doAfter: 1
+      - tag: CrystalYellow
+        name: yellow crystal shard
+        icon:
+          sprite: Objects/Materials/Shards/crystal.rsi
+          state: shard1
+        doAfter: 1
+  - node: icon
+    entity: LightBulbCrystalYellow
+
 - type: constructionGraph
   id: PinkLightBulb
   start: start
@@ -200,6 +260,26 @@
   - node: icon
     entity: LightBulbCrystalOrange
 
+- type: constructionGraph
+  id: BlackLightBulb
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - material: Glass
+        amount: 1
+        doAfter: 1
+      - tag: CrystalBlack
+        name: black crystal shard
+        icon:
+          sprite: Objects/Materials/Shards/crystal.rsi
+          state: shard1
+        doAfter: 1
+  - node: icon
+    entity: LightBulbCrystalBlack
+
 - type: constructionGraph
   id: RedLightBulb
   start: start
diff --git a/Resources/Prototypes/Recipes/Construction/lighting.yml b/Resources/Prototypes/Recipes/Construction/lighting.yml
index d6aeddc7e8..0651fc4572 100644
--- a/Resources/Prototypes/Recipes/Construction/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/lighting.yml
@@ -20,6 +20,17 @@
   icon: { sprite: Objects/Power/light_tube.rsi, state: normal }
   objectType: Item
 
+- type: construction
+  name: yellow light tube
+  id: YellowLight
+  graph: YellowLight
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing a yellow crystal
+  icon: { sprite: Objects/Power/light_tube.rsi, state: normal }
+  objectType: Item
+
 - type: construction
   name: pink light tube
   id: PinkLight
@@ -42,6 +53,17 @@
   icon: { sprite: Objects/Power/light_tube.rsi, state: normal }
   objectType: Item
 
+- type: construction
+  name: black light tube
+  id: BlackLight
+  graph: BlackLight
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing a black crystal. It won't be very bright.
+  icon: { sprite: Objects/Power/light_tube.rsi, state: normal }
+  objectType: Item
+
 - type: construction
   name: red light tube
   id: RedLight
@@ -86,6 +108,17 @@
   icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
   objectType: Item
 
+- type: construction
+  name: yellow light bulb
+  id: YellowLightBulb
+  graph: YellowLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light bulb containing a yellow crystal.
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
+
 - type: construction
   name: pink light bulb
   id: PinkLightBulb
@@ -108,6 +141,17 @@
   icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
   objectType: Item
 
+- type: construction
+  name: black light bulb
+  id: BlackLightBulb
+  graph: BlackLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light bulb containing a black crystal. It won't be very bright.
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
+
 - type: construction
   name: red light bulb
   id: RedLightBulb
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index 30ac6a5373..a7f4ef11e5 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -72,10 +72,18 @@
   id: OreIronCrab
   oreEntity: MobSpawnCrabIron
 
+- type: ore
+  id: OreCoalCrab
+  oreEntity: MobSpawnCrabCoal
+
 - type: ore
   id: OreSilverCrab
   oreEntity: MobSpawnCrabSilver
 
+- type: ore
+  id: OreGoldCrab
+  oreEntity: MobSpawnCrabGold
+
 - type: ore
   id: OreUraniumCrab
   oreEntity: MobSpawnCrabUranium
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 0a25304c2c..179651a113 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -419,6 +419,9 @@
 - type: Tag
   id: Cryobeaker
 
+- type: Tag
+  id: CrystalBlack
+
 - type: Tag
   id: CrystalBlue
 
@@ -437,6 +440,9 @@
 - type: Tag
   id: CrystalRed
 
+- type: Tag
+  id: CrystalYellow
+
 - type: Tag
   id: CubanCarp
 
diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png b/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png
new file mode 100644
index 0000000000..660de64908
Binary files /dev/null and b/Resources/Textures/Effects/mobspawn.rsi/crab_coal.png differ
diff --git a/Resources/Textures/Effects/mobspawn.rsi/crab_gold.png b/Resources/Textures/Effects/mobspawn.rsi/crab_gold.png
new file mode 100644
index 0000000000..aeb8bd1aef
Binary files /dev/null and b/Resources/Textures/Effects/mobspawn.rsi/crab_gold.png differ
diff --git a/Resources/Textures/Effects/mobspawn.rsi/meta.json b/Resources/Textures/Effects/mobspawn.rsi/meta.json
index 720bc8a321..ca0d1fe0fc 100644
--- a/Resources/Textures/Effects/mobspawn.rsi/meta.json
+++ b/Resources/Textures/Effects/mobspawn.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github)",
+  "copyright": "Made by brainfood1183 (github), Gold and Coal Crab pallet swapped by Firewars763 (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -35,6 +35,20 @@
                 ]
             ]
         },
+        {
+            "name": "crab_gold",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
         {
             "name": "crab_uranium",
             "directions": 1,
@@ -62,6 +76,20 @@
                     0.3
                 ]
             ]
+        },
+        {
+            "name": "crab_coal",
+            "directions": 1,
+            "delays": [
+                [
+                    0.6,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png b/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png
new file mode 100644
index 0000000000..a1e877ee1e
Binary files /dev/null and b/Resources/Textures/Mobs/Elemental/orecrab.rsi/coal_crab.png differ
diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png b/Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png
new file mode 100644
index 0000000000..420d96b6c5
Binary files /dev/null and b/Resources/Textures/Mobs/Elemental/orecrab.rsi/gold_crab.png differ
diff --git a/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json b/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json
index a85de36617..c3a0bb3080 100644
--- a/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json
+++ b/Resources/Textures/Mobs/Elemental/orecrab.rsi/meta.json
@@ -5,12 +5,16 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github)",
+  "copyright": "Made by brainfood1183 (github), Gold and Coal Crab pallet swapped by Firewars763 (github),",
   "states": [
     {
       "name": "iron_crab",
       "directions": 4
     },
+    {
+        "name": "coal_crab",
+        "directions": 4
+    },
     {
       "name": "uranium_crab",
       "directions": 4
@@ -19,6 +23,10 @@
       "name": "silver_crab",
       "directions": 4
     },
+    {
+        "name": "gold_crab",
+        "directions": 4
+    },
     {
       "name": "quartz_crab",
       "directions": 4