]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds damaged plating (#21711)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Fri, 17 Nov 2023 05:57:00 +0000 (23:57 -0600)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2023 05:57:00 +0000 (22:57 -0700)
* adds damaged & burnt plating tiles, corrects a miscrediting in attributions.yml

* placeholder BEGONE

* fix those attributions

Resources/Prototypes/Tiles/floors.yml
Resources/Prototypes/Tiles/plating.yml
Resources/Textures/Tiles/attributions.yml
Resources/Textures/Tiles/plating_burnt.png [new file with mode: 0644]
Resources/Textures/Tiles/plating_damaged.png [new file with mode: 0644]

index 13d2985319e3442c77d228f638838aa93b3eda23..23980b98ce278348a03b4ae954036e2c2a7adf57 100644 (file)
   canCrowbar: true
   footstepSounds:
     collection: FootstepFloor
-  itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such.
+  itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such, in SS13 prying destroyed tiles wouldn't give you anything.
   heatCapacity: 10000
 
 - type: tile
index ee15c11157700f2b4f75689066eb9ae078260192..7cf841eec092b2522385d63a4ef6ecebe8d55eac 100644 (file)
   friction: 0.3
   heatCapacity: 10000
 
+- type: tile
+  id: PlatingDamaged
+  name: tiles-plating
+  sprite: /Textures/Tiles/plating_damaged.png
+  variants: 3
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Lattice
+  isSubfloor: true
+  canAxe: true
+  footstepSounds:
+    collection: FootstepPlating
+  friction: 0.3
+  heatCapacity: 10000
+
+- type: tile
+  id: PlatingBurnt
+  name: tiles-plating
+  sprite: /Textures/Tiles/plating_burnt.png
+  baseTurf: Lattice
+  isSubfloor: true
+  canAxe: true
+  footstepSounds:
+    collection: FootstepPlating
+  friction: 0.3
+  heatCapacity: 10000
+
 - type: tile
   id: PlatingAsteroid
   name: tiles-asteroid-plating
index 49cb108eb0bc8938a92eccac68a826f42afa0d76..fdda1f914d14f085d870a47f7581cb7ca027a475 100644 (file)
@@ -6,6 +6,16 @@
   copyright: "CEV-Eris commit 28e589f0ff72a009adf17db767e90be39054f0f2"
   source: "https://github.com/discordia-space/CEV-Eris/"
 
+- files: ["plating.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from CEV-Eris commit 8e74e4370f4d5885f15c3f834973b1223ddb8b1b, modified by github user @Flareguy"
+  source: "https://github.com/discordia-space/CEV-Eris/"
+
+- files: ["plating_damaged.png", "plating_burnt.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified by github user @Flareguy from plating.png, using damaged plating sprites from /tg/station at commit https://github.com/tgstation/tgstation/blob/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae/icons/turf/floors.dmi"
+  source: "https://github.com/space-wizards/space-station-14/pull/21711"
+
 - files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.png", "green_circuit.png", "lino.png", "mono.png", "rock_vault.png", "showroom.png"]
   license: "CC-BY-SA-3.0"
   copyright: "vgstation13 at roughly commit e4d3ea7f69d21c3667be12b114fa935c4640cb05, asteroid_red and asteroid_tile taken from commit /vg/station at commit 02b9f6894af4419c9f7e699a22c402b086d8067e."
@@ -16,7 +26,7 @@
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae."
   source: "https://github.com/tgstation/tgstation/"
 
-- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "plating.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
+- files: ["blue_circuit.png", "cropped_parallax.png", "eighties.png", "gold.png", "grass.png", "ironsand1.png", "ironsand2.png", "ironsand3.png", "ironsand4.png", "junglegrass.png", "lattice.png", "reinforced.png", "silver.png", "snow.png", "wood.png"]
   license: "CC-BY-SA-3.0"
   copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax."
   source: "https://github.com/tgstation/tgstation/"
diff --git a/Resources/Textures/Tiles/plating_burnt.png b/Resources/Textures/Tiles/plating_burnt.png
new file mode 100644 (file)
index 0000000..7c89de0
Binary files /dev/null and b/Resources/Textures/Tiles/plating_burnt.png differ
diff --git a/Resources/Textures/Tiles/plating_damaged.png b/Resources/Textures/Tiles/plating_damaged.png
new file mode 100644 (file)
index 0000000..03984d0
Binary files /dev/null and b/Resources/Textures/Tiles/plating_damaged.png differ