]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds damaged steel tiles (#21700)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Thu, 16 Nov 2023 21:09:50 +0000 (15:09 -0600)
committerGitHub <noreply@github.com>
Thu, 16 Nov 2023 21:09:50 +0000 (14:09 -0700)
* adds destroyed steel tiles; corrects a mistake in attributions.yml

* dode

Resources/Prototypes/Tiles/floors.yml
Resources/Textures/Tiles/attributions.yml
Resources/Textures/Tiles/steel.png
Resources/Textures/Tiles/steel_burnt.png [new file with mode: 0644]
Resources/Textures/Tiles/steel_damaged.png [new file with mode: 0644]

index 43dbd76b10433a992244915678601dd98c4e55a4..13d2985319e3442c77d228f638838aa93b3eda23 100644 (file)
   itemDrop: FloorTileItemLaundry
   heatCapacity: 10000
 
+- type: tile
+  id: FloorSteelDamaged
+  name: tiles-steel-floor
+  sprite: /Textures/Tiles/steel_damaged.png
+  variants: 5
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  canCrowbar: true
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such.
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorSteelBurnt
+  name: tiles-steel-floor
+  sprite: /Textures/Tiles/steel_burnt.png
+  variants: 2
+  placementVariants:
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  canCrowbar: true
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemSteel #Same case as FloorSteelDamaged, make it null when possible
+  heatCapacity: 10000
+
+
 # Concrete
 - type: tile
   id: FloorConcrete
index b732333dd799ea68e09e8590d1de0edd4ffe4b13..49cb108eb0bc8938a92eccac68a826f42afa0d76 100644 (file)
   copyright: "arcadered renamed from eightiesred, arcadeblue by Peptide90 modified from arcadered.png, tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49"
   source: "https://github.com/tgstation/tgstation/"
 
-- files: ["hull", "hull_reinforced.png"]
+- files: ["hull", "hull_reinforced.png", "steel_damaged.png", "steel_burnt.png"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae"
-  source: "https://github.com/space-wizards/space-station-14/pull/18676"
+  source: "https://github.com/tgstation/tgstation/"
 
 - files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png"]
   license: "CC-BY-SA-3.0"
index d9405e7d5cf0a5682e36687c521714cec2d6b5c1..b7792ef138e88ca6793940d036c5b691d57314e7 100644 (file)
Binary files a/Resources/Textures/Tiles/steel.png and b/Resources/Textures/Tiles/steel.png differ
diff --git a/Resources/Textures/Tiles/steel_burnt.png b/Resources/Textures/Tiles/steel_burnt.png
new file mode 100644 (file)
index 0000000..646c285
Binary files /dev/null and b/Resources/Textures/Tiles/steel_burnt.png differ
diff --git a/Resources/Textures/Tiles/steel_damaged.png b/Resources/Textures/Tiles/steel_damaged.png
new file mode 100644 (file)
index 0000000..c226b12
Binary files /dev/null and b/Resources/Textures/Tiles/steel_damaged.png differ