]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Shadow Dimension visual pack (#21237)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Wed, 25 Oct 2023 13:36:22 +0000 (16:36 +0300)
committerGitHub <noreply@github.com>
Wed, 25 Oct 2023 13:36:22 +0000 (00:36 +1100)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
19 files changed:
Resources/Prototypes/Entities/Objects/Decoration/flora.yml
Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
Resources/Prototypes/Entities/Tiles/shadow_basalt.yml [new file with mode: 0644]
Resources/Prototypes/Tiles/floors.yml
Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree01.png [new file with mode: 0644]
Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree02.png [new file with mode: 0644]
Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree03.png [new file with mode: 0644]
Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree04.png [new file with mode: 0644]
Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree05.png [new file with mode: 0644]
Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree06.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt1.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt2.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt3.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt4.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt5.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/shadowbasalt.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Tiles/attributions.yml
Resources/Textures/Tiles/chromite.png [new file with mode: 0644]

index 9577cc1c4b1af0afcccb1687e9021d1b9c92910a..374a9a272c755cf8caf1ea01f497b67f5455462a 100644 (file)
   components:
   - type: Sprite
     state: treestumpconifer
+
+- type: entity
+  parent: FloraTree01
+  id: ShadowTree01
+  name: tree
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_shadow_trees.rsi
+    state: tree01
+
+- type: entity
+  parent: ShadowTree01
+  id: ShadowTree02
+  name: tree
+  components:
+  - type: Sprite
+    state: tree02
+    
+- type: entity
+  parent: ShadowTree01
+  id: ShadowTree03
+  name: tree
+  components:
+  - type: Sprite
+    state: tree03
+    
+- type: entity
+  parent: ShadowTree01
+  id: ShadowTree04
+  name: tree
+  components:
+  - type: Sprite
+    state: tree04
+    
+- type: entity
+  parent: ShadowTree01
+  id: ShadowTree05
+  name: tree
+  components:
+  - type: Sprite
+    state: tree05
+    
+- type: entity
+  parent: ShadowTree01
+  id: ShadowTree06
+  name: tree
+  components:
+  - type: Sprite
+    state: tree06
\ No newline at end of file
index 9b513b2da19bee1db94c5d7d5a71b37a7bf421d9..9d5ff1b473257ea703d70e2558ab147749fef1c7 100644 (file)
           state: rock_chromite_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_chromite_west
-        - state: rock_chromite
+        - state: rock_gold
 
 - type: entity
   id: WallRockChromitePlasma
           state: rock_andesite_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_andesite_west
-        - state: rock_andesite
+        - state: rock_gold
 
 - type: entity
   id: WallRockAndesitePlasma
diff --git a/Resources/Prototypes/Entities/Tiles/shadow_basalt.yml b/Resources/Prototypes/Entities/Tiles/shadow_basalt.yml
new file mode 100644 (file)
index 0000000..e583523
--- /dev/null
@@ -0,0 +1,83 @@
+- type: entity
+  id: ShadowBasaltOne
+  name: shadowstone
+  description: Cold rock
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Clickable
+    - type: Sprite
+      sprite: /Textures/Tiles/Planet/shadowbasalt.rsi
+      layers:
+        - state: basalt1
+          shader: unshaded
+      drawdepth: LowFloors
+    - type: SyncSprite
+    - type: RequiresTile
+    - type: Transform
+      anchored: true
+    - type: Tag
+      tags:
+        - HideContextMenu
+
+- type: entity
+  id: ShadowBasaltTwo
+  parent: BasaltOne
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      layers:
+        - state: basalt2
+          shader: unshaded
+
+- type: entity
+  id: ShadowBasaltThree
+  parent: BasaltOne
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      layers:
+        - state: basalt3
+          shader: unshaded
+
+- type: entity
+  id: ShadowBasaltFour
+  parent: BasaltOne
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      layers:
+        - state: basalt4
+          shader: unshaded
+
+- type: entity
+  id: ShadowBasaltFive
+  parent: BasaltOne
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: Sprite
+      layers:
+        - state: basalt5
+          shader: unshaded
+
+- type: entity
+  id: ShadowBasaltRandom
+  parent: ShadowBasaltOne
+  suffix: Random
+  components:
+    - type: RandomSprite
+      available:
+        - 0:
+            basalt1: ""
+        - 0:
+            basalt2: ""
+        - 0:
+            basalt3: ""
+        - 0:
+            basalt4: ""
+        - 0:
+            basalt5: ""
\ No newline at end of file
index 908cd466a3f29acce6cadaaceb4d573080c56022..43dbd76b10433a992244915678601dd98c4e55a4 100644 (file)
   itemDrop: FloorTileItemWeb
   heatCapacity: 10000
 
+- type: tile
+  id: FloorChromite
+  name: tiles-chromite
+  sprite: /Textures/Tiles/chromite.png
+  variants: 7
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Space
+  isSubfloor: true
+  canCrowbar: false
+  footstepSounds:
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+
 #Hull tiles
 - type: tile
   id: FloorHull
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/meta.json
new file mode 100644 (file)
index 0000000..8f86af7
--- /dev/null
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/e00cae8d065f9cf520688cc0dd0e15ba5bef12a9/icons/obj/flora/jungleflora.dmi and recolor by TheShuEd",
+    "size": {
+        "x": 96,
+        "y": 96
+    },
+    "states": [
+        {
+            "name": "tree01"
+        },
+        {
+            "name": "tree02"
+        },
+        {
+            "name": "tree03"
+        },
+        {
+            "name": "tree04"
+        },
+        {
+            "name": "tree05"
+        },
+        {
+            "name": "tree06"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree01.png b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree01.png
new file mode 100644 (file)
index 0000000..99ca699
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree01.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree02.png b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree02.png
new file mode 100644 (file)
index 0000000..4aa9a29
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree02.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree03.png b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree03.png
new file mode 100644 (file)
index 0000000..5a833a3
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree03.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree04.png b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree04.png
new file mode 100644 (file)
index 0000000..4d1cefe
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree04.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree05.png b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree05.png
new file mode 100644 (file)
index 0000000..8b2cd2a
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree05.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree06.png b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree06.png
new file mode 100644 (file)
index 0000000..888fbfd
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_shadow_trees.rsi/tree06.png differ
diff --git a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt1.png b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt1.png
new file mode 100644 (file)
index 0000000..e8f8732
Binary files /dev/null and b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt1.png differ
diff --git a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt2.png b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt2.png
new file mode 100644 (file)
index 0000000..00a2711
Binary files /dev/null and b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt2.png differ
diff --git a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt3.png b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt3.png
new file mode 100644 (file)
index 0000000..27219f4
Binary files /dev/null and b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt3.png differ
diff --git a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt4.png b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt4.png
new file mode 100644 (file)
index 0000000..6081f54
Binary files /dev/null and b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt4.png differ
diff --git a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt5.png b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt5.png
new file mode 100644 (file)
index 0000000..76c13b2
Binary files /dev/null and b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/basalt5.png differ
diff --git a/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/meta.json b/Resources/Textures/Tiles/Planet/shadowbasalt.rsi/meta.json
new file mode 100644 (file)
index 0000000..0d71d4b
--- /dev/null
@@ -0,0 +1,66 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "taken from tgstation @ commit a0ca7b3f46132517f71f08bfda465667d133b5d7 and edited by TheShuEd",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "basalt1",
+      "delays": [
+        [
+          2,
+          2,
+          2,
+          2
+        ]
+      ]
+    },
+    {
+      "name": "basalt2",
+      "delays": [
+        [
+          2,
+          2,
+          2,
+          2
+        ]
+      ]
+    },
+    {
+      "name": "basalt3",
+      "delays": [
+        [
+          2,
+          2,
+          2,
+          2
+        ]
+      ]
+    },
+    {
+      "name": "basalt4",
+      "delays": [
+        [
+          2,
+          2,
+          2,
+          2
+        ]
+      ]
+    },
+    {
+      "name": "basalt5",
+      "delays": [
+        [
+          2,
+          2,
+          2,
+          2
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
index 641100fe421a98a2e49f3942b201c1ad4fff9d32..b732333dd799ea68e09e8590d1de0edd4ffe4b13 100644 (file)
@@ -95,3 +95,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "taken at https://github.com/ParadiseSS13/Paradise/blob/8b7f4c8b69c74c6de5a755272eb8d3520f3d87c7/icons/turf/floors.dmi"
   source: "https://github.com/ParadiseSS13/Paradise"
+  
+- files: ["chromite.png"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "taken at commit 0587dd16e28108bdf0b0a28e2caae4319845e861, and recolored by TheShuEd"
+  source: "https://github.com/Mojave-Sun/mojave-sun-13"
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/chromite.png b/Resources/Textures/Tiles/chromite.png
new file mode 100644 (file)
index 0000000..631b9bf
Binary files /dev/null and b/Resources/Textures/Tiles/chromite.png differ