From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Sun, 11 Feb 2024 20:53:56 +0000 (-0600)
Subject: Shuttle floor resprite (#25127)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a93466ac24c7256d4b584ba830c4fa1cda253d5a;p=space-station-14.git

Shuttle floor resprite (#25127)

* resprites shuttle tiles

* resprites shuttle floor tiles & adds grey/black shuttle tiles

* attributions.yml update
---

diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 293b6cd7fa..42e0c08223 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -77,6 +77,8 @@ tiles-blue-shuttle-floor = blue shuttle floor
 tiles-orange-shuttle-floor = orange shuttle floor
 tiles-purple-shuttle-floor = purple shuttle floor
 tiles-red-shuttle-floor = red shuttle floor
+tiles-grey-shuttle-floor = grey shuttle floor
+tiles-black-shuttle-floor = black shuttle floor
 tiles-gold-tile = gold tile
 tiles-silver-tile = silver tile
 tiles-glass-floor = glass floor
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 361efb5266..445e2c7b5b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -745,6 +745,38 @@
   - type: Stack
     stackType: FloorTileStackShuttleRed
 
+- type: entity
+  name: grey shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleGrey
+  components:
+  - type: Sprite
+    state: shuttlegrey
+  - type: Item
+    heldPrefix: shuttlegrey
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorShuttleGrey
+  - type: Stack
+    stackType: FloorTileStackShuttleGrey
+
+- type: entity
+  name: black shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleBlack
+  components:
+  - type: Sprite
+    state: shuttleblack
+  - type: Item
+    heldPrefix: shuttleblack
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorShuttleBlack
+  - type: Stack
+    stackType: FloorTileStackShuttleBlack
+
 # Materials
 - type: entity
   name: gold floor
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index 5a46982374..01acfd13f8 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -145,6 +145,20 @@
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorTileStackShuttleGrey
+  name: grey shuttle tile
+  spawn: FloorTileItemShuttleGrey
+  maxCount: 30
+  itemSize: 5
+
+- type: stack
+  id: FloorTileStackShuttleBlack
+  name: black shuttle tile
+  spawn: FloorTileItemShuttleBlack
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileStackEighties
   name: eighties floor tile
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index d265aa843d..214ee617e9 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1183,6 +1183,12 @@
   id: FloorShuttleWhite
   name: tiles-white-shuttle-floor
   sprite: /Textures/Tiles/shuttlewhite.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1191,10 +1197,52 @@
   itemDrop: FloorTileItemShuttleWhite
   heatCapacity: 10000
 
+- type: tile
+  id: FloorShuttleGrey
+  name: tiles-grey-shuttle-floor
+  sprite: /Textures/Tiles/shuttlegrey.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemShuttleGrey
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorShuttleBlack
+  name: tiles-black-shuttle-floor
+  sprite: /Textures/Tiles/shuttleblack.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemShuttleBlack
+  heatCapacity: 10000
+
 - type: tile
   id: FloorShuttleBlue
   name: tiles-blue-shuttle-floor
   sprite: /Textures/Tiles/shuttleblue.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1207,6 +1255,12 @@
   id: FloorShuttleOrange
   name: tiles-orange-shuttle-floor
   sprite: /Textures/Tiles/shuttleorange.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1219,6 +1273,12 @@
   id: FloorShuttlePurple
   name: tiles-purple-shuttle-floor
   sprite: /Textures/Tiles/shuttlepurple.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1231,6 +1291,12 @@
   id: FloorShuttleRed
   name: tiles-red-shuttle-floor
   sprite: /Textures/Tiles/shuttlered.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png
index 14d2f9ef84..f548ef7ace 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png
index e17ee0500b..e3c0948112 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 05aeba33fd..9fc66d78b9 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -195,6 +195,12 @@
     {
       "name": "shuttlered"
     },
+    {
+      "name": "shuttlegrey"
+    },
+    {
+      "name": "shuttleblack"
+    },
     {
       "name": "carpetclown"
     },
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png
new file mode 100644
index 0000000000..008eeb40e7
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png
index 8fc34f3912..4fc4076aee 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png
new file mode 100644
index 0000000000..4fd7069afe
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png
index 517da85336..3433d217e2 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png
index c9459da1e8..297822ee7f 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png
index e4f073d6dc..024fef68f1 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png
index fcc482b34b..ba8440cd33 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png
index 8742892b23..385e2d59ac 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png and b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png differ
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 3616d5a7ec..e9795a358b 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -66,9 +66,9 @@
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae"
   source: "https://github.com/tgstation/tgstation/"
 
-- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png"]
+- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png"]
   license: "CC-BY-SA-3.0"
-  copyright: "paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris"
+  copyright: "Modified by Flareguy for Space Station 14. Unmodified sprite from paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris"
   source: "https://github.com/ParadiseSS13/Paradise"
 
 - files: ["deprecated.png"]
diff --git a/Resources/Textures/Tiles/shuttleblack.png b/Resources/Textures/Tiles/shuttleblack.png
new file mode 100644
index 0000000000..e5dc3ff666
Binary files /dev/null and b/Resources/Textures/Tiles/shuttleblack.png differ
diff --git a/Resources/Textures/Tiles/shuttleblue.png b/Resources/Textures/Tiles/shuttleblue.png
index da848dec98..8a57cf8b0a 100644
Binary files a/Resources/Textures/Tiles/shuttleblue.png and b/Resources/Textures/Tiles/shuttleblue.png differ
diff --git a/Resources/Textures/Tiles/shuttlegrey.png b/Resources/Textures/Tiles/shuttlegrey.png
new file mode 100644
index 0000000000..337fef7d30
Binary files /dev/null and b/Resources/Textures/Tiles/shuttlegrey.png differ
diff --git a/Resources/Textures/Tiles/shuttleorange.png b/Resources/Textures/Tiles/shuttleorange.png
index 46f562b506..0e42ad3467 100644
Binary files a/Resources/Textures/Tiles/shuttleorange.png and b/Resources/Textures/Tiles/shuttleorange.png differ
diff --git a/Resources/Textures/Tiles/shuttlepurple.png b/Resources/Textures/Tiles/shuttlepurple.png
index 3e05a9676d..2236948d38 100644
Binary files a/Resources/Textures/Tiles/shuttlepurple.png and b/Resources/Textures/Tiles/shuttlepurple.png differ
diff --git a/Resources/Textures/Tiles/shuttlered.png b/Resources/Textures/Tiles/shuttlered.png
index 49b6665dd2..732cf385d6 100644
Binary files a/Resources/Textures/Tiles/shuttlered.png and b/Resources/Textures/Tiles/shuttlered.png differ
diff --git a/Resources/Textures/Tiles/shuttlewhite.png b/Resources/Textures/Tiles/shuttlewhite.png
index 1e2dd5d0d5..1308a78d9e 100644
Binary files a/Resources/Textures/Tiles/shuttlewhite.png and b/Resources/Textures/Tiles/shuttlewhite.png differ