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 293b6cd7fa4735b45c01d864ae691719f0aed1f8..42e0c0822354529e76ef45ef2f0b00c29cffedcf 100644 (file)
--- 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 361efb52663a7d865ec907e85a3c082e1513c52b..445e2c7b5b1345452b81905858803518433b9c01 100644 (file)
--- 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 5a46982374975e316f9c55c6bb276ef3c01b85a4..01acfd13f84af5b69b5d005ee60aad2cdee8c019 100644 (file)
--- 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 d265aa843d55c28f905769fbf3ab53f47c91ce53..214ee617e9e609e920df3cbd61f90873a0f404d3 100644 (file)
--- 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 14d2f9ef8496b5981f055b6f721d5255489fdb9b..f548ef7ace97cfefdb8f052cba32c53c36d67631 100644 (file)
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 e17ee0500b9b5f4badb2e5b7ef0ab1101d7d57f5..e3c0948112e80d622009f7bbcf48f5ce991a5bdf 100644 (file)
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 05aeba33fd52b559fda29bf4da27df416fbbcef6..9fc66d78b9076f3730b8557b1ffdf07f1740b3b6 100644 (file)
--- 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 (file)
index 0000000..008eeb4
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 8fc34f39126984e530eac3ad0167899d449f0bd7..4fc4076aee30cd01c3569325ba6b0934ef3c2bae 100644 (file)
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 (file)
index 0000000..4fd7069
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 517da853365a652d642a03ea9fe3f3130a27daa0..3433d217e27119716ea891830fa0877f4fead37a 100644 (file)
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 c9459da1e8d51061375138fdce31111647714248..297822ee7f1639f1261fe876830ff98f3d5c4423 100644 (file)
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 e4f073d6dc2a7346b02d1090e007dd763143d8e3..024fef68f1b5546f32031b0a9f3d9c4bbf3a106b 100644 (file)
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 fcc482b34b2e996af030465ee5c650dba62a37e7..ba8440cd33ab2bb216fc54a7adf1bd23c10dfa37 100644 (file)
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 8742892b236dd50007252ea074a3f237425b4d96..385e2d59ac24baf8588fb98f204cbb1330475e4d 100644 (file)
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 3616d5a7ec4981c3842e83d33c5b1ddbd0b61e2d..e9795a358bc953e14a280f7c6f83f8b240964fa9 100644 (file)
--- 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 (file)
index 0000000..e5dc3ff
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 da848dec986ce1f39e0086e6d4daa89c869f7a54..8a57cf8b0a19baffb73ea777d58c6c1fb3861e84 100644 (file)
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 (file)
index 0000000..337fef7
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 46f562b506c59e65606df9ce5b0d3afcca415968..0e42ad3467d570b081b7bc26b36682eca3486397 100644 (file)
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 3e05a9676db1e4918a9da2b9f6d066dc2713f00e..2236948d38223129c5a117ac8c44a7d1f89899ff 100644 (file)
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 49b6665dd2751319470ea99f5b3204d3b9741a59..732cf385d64451ee78b57b4563ec9ca4003c5dd1 100644 (file)
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 1e2dd5d0d5eac1d6495763feeefadfccc07b9ade..1308a78d9e49e36c02d29afc77b0cafbca5e2852 100644 (file)
Binary files a/Resources/Textures/Tiles/shuttlewhite.png and b/Resources/Textures/Tiles/shuttlewhite.png differ