diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 59fa88be2b2..b5ca240d5ca 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -201,7 +201,7 @@ collection: FootstepHull itemDrop: FloorTileItemBrassFilled heatCapacity: 10000 - + - type: tile id: FloorBrassReebe name: tiles-brass-floor-reebe @@ -1207,12 +1207,6 @@ 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 ] @@ -1225,12 +1219,6 @@ 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 ] @@ -1243,12 +1231,6 @@ 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 ] @@ -1261,12 +1243,6 @@ 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 ] @@ -1279,12 +1255,6 @@ 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 ] @@ -1297,12 +1267,6 @@ 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 ] @@ -1315,12 +1279,6 @@ 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 ] @@ -1940,4 +1898,4 @@ barestepSounds: collection: BarestepWood itemDrop: FloorTileItemWoodLarge - heatCapacity: 10000 \ No newline at end of file + heatCapacity: 10000 diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_box.png b/Resources/Textures/Decals/bricktile.rsi/dark_box.png index 153e7d3cfce..d9b23d56766 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_box.png and b/Resources/Textures/Decals/bricktile.rsi/dark_box.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png index b10deefb78e..284559148eb 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png index 7f28df09618..d249245bd4e 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png index 2cb5db32d35..c608bd12e03 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png index f4d9633ba27..7d47c299ba6 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png index e7f63be4219..323e75d76f7 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png index 806c94fe730..3d91cfbdc0f 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png index 4bae8c99b74..96920182050 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png index b010ef23997..dcb96039e9d 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png and b/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png index 08f219869f0..7a9da46b878 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png index d716a81e831..d0ccf15f353 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png index fc60f896982..70b3944d6c6 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png index c4ac0d8f100..9b74f978998 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png index 99cb16a6ad8..f2f3b75fd8f 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png index 928b56c942a..ebf08c0ac2c 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png index f0ffe1c434d..5fc1efc7bbe 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png index bfae586a073..1bd29e14973 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png and b/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/meta.json b/Resources/Textures/Decals/bricktile.rsi/meta.json index 313a68db1ac..2658bbe3b3c 100644 --- a/Resources/Textures/Decals/bricktile.rsi/meta.json +++ b/Resources/Textures/Decals/bricktile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Edited by Flareguy, originally created by github user @moonheart08", + "copyright": "Made by github user @Morb0. Modified v2 by ko4erga (discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_box.png b/Resources/Textures/Decals/bricktile.rsi/steel_box.png index f7e5af84967..124905eabfc 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_box.png and b/Resources/Textures/Decals/bricktile.rsi/steel_box.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png index dcf9e52b7cd..f17f3c19991 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png index 9601a55f50d..86fa0e9e007 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png index 134997a6112..203dce3f83b 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png index bb107cb037e..9eb1cfc533f 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png index 58c70fb9485..fb05cd35c4f 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png index 36092d5d0fe..e1e2e04c394 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png index b377ac46b91..08070278254 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png index e9fd6a05797..0eeb92f6f71 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png and b/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png index d8e5a50f8cf..33f2919865b 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png index ea84f9755ff..644f5448cd0 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png index 7d29fb22571..0f9072cc9e5 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png index d8fac15ac82..cca9bc52c4b 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png index 0eded8ad61f..10b910fe169 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png index 8c2112e975a..0a6d337048b 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png index 0624ec350e0..60bf358d658 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png index a67b6abc834..aff9dabab68 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png and b/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_box.png b/Resources/Textures/Decals/bricktile.rsi/white_box.png index d4454f06763..f95af9e5d68 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_box.png and b/Resources/Textures/Decals/bricktile.rsi/white_box.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png index 292139bfe4c..90cda6ec336 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png index 5624893809e..3fe0a9634c7 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png index addb819cece..c4cdab83f1c 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png index fb06423131e..a2157c064c4 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_e.png b/Resources/Textures/Decals/bricktile.rsi/white_end_e.png index 548bdd63039..6b857400be3 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_e.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_n.png b/Resources/Textures/Decals/bricktile.rsi/white_end_n.png index 68fe5bcf7b6..739e4dcdfcd 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_n.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_s.png b/Resources/Textures/Decals/bricktile.rsi/white_end_s.png index 4b96c7858aa..03b4eb7593e 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_s.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_w.png b/Resources/Textures/Decals/bricktile.rsi/white_end_w.png index c01877b1769..a982e97bec6 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_end_w.png and b/Resources/Textures/Decals/bricktile.rsi/white_end_w.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png index 0726c450660..e8d326d08d5 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png index 5e75689308a..1b6e902e535 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png index 82013151cb9..f41846183f0 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png index 848d13c3710..dfddc4c38c5 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png and b/Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_e.png b/Resources/Textures/Decals/bricktile.rsi/white_line_e.png index ecbc891f6f7..1d70a2d6ede 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_e.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_e.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_n.png b/Resources/Textures/Decals/bricktile.rsi/white_line_n.png index 1d7203daab8..cfd681dcbbe 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_n.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_n.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_s.png b/Resources/Textures/Decals/bricktile.rsi/white_line_s.png index 408d3220d75..c92bae8346a 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_s.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_s.png differ diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_w.png b/Resources/Textures/Decals/bricktile.rsi/white_line_w.png index fd6bf603947..4bdf37aac22 100644 Binary files a/Resources/Textures/Decals/bricktile.rsi/white_line_w.png and b/Resources/Textures/Decals/bricktile.rsi/white_line_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_box.png b/Resources/Textures/Decals/minitile.rsi/dark_box.png index 1e25897961e..87053060a3a 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_box.png and b/Resources/Textures/Decals/minitile.rsi/dark_box.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png index 000005cf10f..044d3ee58af 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png index 428ce9c617f..92590b4a514 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png index d369a1fee4e..8fe46845e13 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png index bf3b1015df4..48e31919367 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png and b/Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_e.png b/Resources/Textures/Decals/minitile.rsi/dark_end_e.png index 15f5068670c..82b0087a037 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_e.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_n.png b/Resources/Textures/Decals/minitile.rsi/dark_end_n.png index 3bd2d26686b..b642ce1bf4b 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_n.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_s.png b/Resources/Textures/Decals/minitile.rsi/dark_end_s.png index 68b87cb6f32..114b1ac821b 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_s.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_w.png b/Resources/Textures/Decals/minitile.rsi/dark_end_w.png index d6e3ca96ea6..d9099511d8c 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_end_w.png and b/Resources/Textures/Decals/minitile.rsi/dark_end_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png index 82cfac92064..7dac62620b8 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png index 6cebbf93f45..e3ef1166304 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png index f6890fe52fe..3ddb20a5f4d 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png index 0a5c96d7621..cc8919b283d 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png and b/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_e.png b/Resources/Textures/Decals/minitile.rsi/dark_line_e.png index c50102d604c..544580f150f 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_e.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_n.png b/Resources/Textures/Decals/minitile.rsi/dark_line_n.png index e1ca99dbc64..ba8bb6a1769 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_n.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_s.png b/Resources/Textures/Decals/minitile.rsi/dark_line_s.png index 1005b61e533..d2419e8cd3b 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_s.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_w.png b/Resources/Textures/Decals/minitile.rsi/dark_line_w.png index a53ed8a21c9..9f809bd964d 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/dark_line_w.png and b/Resources/Textures/Decals/minitile.rsi/dark_line_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/meta.json b/Resources/Textures/Decals/minitile.rsi/meta.json index 313a68db1ac..50dd3a3a1b2 100644 --- a/Resources/Textures/Decals/minitile.rsi/meta.json +++ b/Resources/Textures/Decals/minitile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Edited by Flareguy, originally created by github user @moonheart08", + "copyright": "Made by github user @Morb0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Decals/minitile.rsi/steel_box.png b/Resources/Textures/Decals/minitile.rsi/steel_box.png index 25643de33c0..65bfc266e91 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_box.png and b/Resources/Textures/Decals/minitile.rsi/steel_box.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png index b11860e110e..0eaa625b811 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png index 9cd5e7d03a4..8216073046e 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png index 1446f6856ee..2535334eab0 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png index 3d1a5dad3f4..81f8f263530 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png and b/Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_e.png b/Resources/Textures/Decals/minitile.rsi/steel_end_e.png index a01e46cc97f..a5bd0f3807f 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_e.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_n.png b/Resources/Textures/Decals/minitile.rsi/steel_end_n.png index 631f02a18a5..5ca76664588 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_n.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_s.png b/Resources/Textures/Decals/minitile.rsi/steel_end_s.png index 19eede5c2d1..58edc11fa10 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_s.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_w.png b/Resources/Textures/Decals/minitile.rsi/steel_end_w.png index 465299858c2..b03aa59c9c8 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_end_w.png and b/Resources/Textures/Decals/minitile.rsi/steel_end_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png index d8e5a50f8cf..b32452a8db8 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png index ea84f9755ff..0bda9148f10 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png index 7d29fb22571..de8f47511a8 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png index d8fac15ac82..bdee5ab5e01 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png and b/Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_e.png b/Resources/Textures/Decals/minitile.rsi/steel_line_e.png index 3bdd0e2d4f7..ba161c6f186 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_e.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_n.png b/Resources/Textures/Decals/minitile.rsi/steel_line_n.png index 953586a1c50..f73aa627b9f 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_n.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_s.png b/Resources/Textures/Decals/minitile.rsi/steel_line_s.png index 89b0fe63f0b..fe8804e8c99 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_s.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_w.png b/Resources/Textures/Decals/minitile.rsi/steel_line_w.png index 37a7a41a7f9..37f152f7ff1 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/steel_line_w.png and b/Resources/Textures/Decals/minitile.rsi/steel_line_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_box.png b/Resources/Textures/Decals/minitile.rsi/white_box.png index 995c63267d0..b8f0174c49f 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_box.png and b/Resources/Textures/Decals/minitile.rsi/white_box.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png b/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png index c584d398764..f0342975d29 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png index 04cdc186e58..8d751af952e 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_se.png b/Resources/Textures/Decals/minitile.rsi/white_corner_se.png index be5170a0e22..54eea747f03 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_se.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png b/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png index 756200c2631..b57417997e5 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png and b/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_e.png b/Resources/Textures/Decals/minitile.rsi/white_end_e.png index 3fd25f45991..e256a862352 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_e.png and b/Resources/Textures/Decals/minitile.rsi/white_end_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_n.png b/Resources/Textures/Decals/minitile.rsi/white_end_n.png index edc8a69135d..a8ba5574771 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_n.png and b/Resources/Textures/Decals/minitile.rsi/white_end_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_s.png b/Resources/Textures/Decals/minitile.rsi/white_end_s.png index ca2528efd15..55823a70963 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_s.png and b/Resources/Textures/Decals/minitile.rsi/white_end_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_w.png b/Resources/Textures/Decals/minitile.rsi/white_end_w.png index b669f8e54dc..d570b8c404d 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_end_w.png and b/Resources/Textures/Decals/minitile.rsi/white_end_w.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png index 7f8448e5026..76733f6c224 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png index 5e75689308a..b368cd57316 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_se.png b/Resources/Textures/Decals/minitile.rsi/white_inner_se.png index 82013151cb9..819ebfa14df 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_se.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_se.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png b/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png index 7b3b53dde22..dbcb0a02d40 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png and b/Resources/Textures/Decals/minitile.rsi/white_inner_sw.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_e.png b/Resources/Textures/Decals/minitile.rsi/white_line_e.png index 99edbdd838e..8b81f033897 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_e.png and b/Resources/Textures/Decals/minitile.rsi/white_line_e.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_n.png b/Resources/Textures/Decals/minitile.rsi/white_line_n.png index 6846ec65fed..be0a78eb007 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_n.png and b/Resources/Textures/Decals/minitile.rsi/white_line_n.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_s.png b/Resources/Textures/Decals/minitile.rsi/white_line_s.png index 54749e90f58..d825870a08c 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_s.png and b/Resources/Textures/Decals/minitile.rsi/white_line_s.png differ diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_w.png b/Resources/Textures/Decals/minitile.rsi/white_line_w.png index 663ee84761e..53b8223cb19 100644 Binary files a/Resources/Textures/Decals/minitile.rsi/white_line_w.png and b/Resources/Textures/Decals/minitile.rsi/white_line_w.png differ diff --git a/Resources/Textures/Tiles/arcadeblue2.png b/Resources/Textures/Tiles/arcadeblue2.png index 013af9f36f7..3def0f19c7e 100644 Binary files a/Resources/Textures/Tiles/arcadeblue2.png and b/Resources/Textures/Tiles/arcadeblue2.png differ diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml index 7cfe5535a0a..124113a9032 100644 --- a/Resources/Textures/Tiles/attributions.yml +++ b/Resources/Textures/Tiles/attributions.yml @@ -6,27 +6,22 @@ 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"] +- files: [ "asteroid_red.png", "asteroid_tile.png", "elevator_shaft.png", "freezer.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." source: "https://github.com/vgstation-coders/vgstation13" - + - files: [ "asteroid.png", "asteroid_dug.png", "asteroid0.png"] license: "CC-BY-SA-3.0" 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", "reinforced.png", "silver.png", "snow.png", "wood.png"] +- files: ["steel.png", "dark.png", "hydro.png", "plating.png", "reinforced.png", "steel_dirty.png", "white.png", "bar.png", "laundry.png", "mime.png", "clown.png", "kitchen.png"] + license: "CC-BY-SA-3.0" + copyright: "TauCetiStation commit 4cd533cf0a4243050364023af9a4fcaca209dce7" + source: "https://github.com/TauCetiStation/TauCetiClassic/" + +- files: ["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"] license: "CC-BY-SA-3.0" copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, cropped_parallax modified from parallax." source: "https://github.com/tgstation/tgstation/" @@ -40,7 +35,7 @@ license: "CC-BY-SA-3.0" copyright: "Modified from plating.png by github user @Flareguy" source: "https://github.com/space-wizards/space-station-14/" - + - files: ["rglass.png"] license: "CC-BY-SA-3.0" copyright: "tgstation commit 8abb19545828230d92ba18827feeb42a67a55d49, rglass modified by github user @notquitehadouken." @@ -51,6 +46,16 @@ copyright: "Created by github user @notquitehadouken." source: "https://github.com/space-wizards/space-station-14/pull/17948" +- files: [ "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "white_plastic.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "dark_plastic.png" ] + license: "CC0-1.0" + copyright: "Created by github user @morb0" + source: "https://github.com/space-syndicate/space-station-14/pull/489" + +- files: [ "cafeteria.png", "checker_dark.png" ] + license: "CC-BY-SA-3.0" + copyright: "Created by github user @Flareguy, original, unedited base tiles modified from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae and github user @moonheart08" + source: "https://github.com/space-wizards/space-station-14/" + - files: [ "bar.png", "lime.png", "blue.png", "kitchen.png", "laundry.png", "mime.png", "steel.png", "steel_dirty.png", "steel_diagonal.png", "steel_mini.png", "steel_offset.png", "steel_pavement.png", "white.png", "white_diagonal.png", "white_mini.png", "white_offset.png", "white_pavement.png", "dark.png", "dark_diagonal.png", "dark_mini.png", "dark_offset.png", "dark_pavement.png", "hydro.png", "plastic.png", "dark_plastic.png", "white_plastic.png", "cafeteria.png", "checker_dark.png", "clown.png" ] license: "CC-BY-SA-3.0" copyright: "Created by github user @Flareguy, original, unedited base tiles modified from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae and github user @moonheart08" @@ -61,14 +66,14 @@ 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", "steel_damaged.png", "steel_burnt.png"] +- files: ["hull", "hull_reinforced.png"] license: "CC-BY-SA-3.0" copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae" - source: "https://github.com/tgstation/tgstation/" + source: "https://github.com/space-wizards/space-station-14/pull/18676" -- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png"] +- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png", "green_circuit.png", "blue_circuit.png", "red_circuit.png"] license: "CC-BY-SA-3.0" - copyright: "Modified by Flareguy for Space Station 14. Unmodified sprite from paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris" + copyright: "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/icons/turf/floors.dmi" source: "https://github.com/ParadiseSS13/Paradise" - files: ["deprecated.png"] @@ -90,7 +95,7 @@ license: "CC-BY-SA-3.0" copyright: "Fortuna commit 2a9408a47e2f83d945335e4feeeeafb552173e6f, grasslight and dirt by Peptide based on grassdark.png and dirt." source: "https://github.com/FortunaSS13/Fortuna" - + - files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"] license: "CC-BY-SA-3.0" copyright: "by brainfood for space-station-14, ." @@ -105,7 +110,7 @@ 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" diff --git a/Resources/Textures/Tiles/bar.png b/Resources/Textures/Tiles/bar.png index c7dded0c6b9..d786d3ed763 100644 Binary files a/Resources/Textures/Tiles/bar.png and b/Resources/Textures/Tiles/bar.png differ diff --git a/Resources/Textures/Tiles/blue_circuit.png b/Resources/Textures/Tiles/blue_circuit.png index 021c5363d6e..529654b467b 100644 Binary files a/Resources/Textures/Tiles/blue_circuit.png and b/Resources/Textures/Tiles/blue_circuit.png differ diff --git a/Resources/Textures/Tiles/cafeteria.png b/Resources/Textures/Tiles/cafeteria.png index 69e8dc47f05..451b0825f55 100644 Binary files a/Resources/Textures/Tiles/cafeteria.png and b/Resources/Textures/Tiles/cafeteria.png differ diff --git a/Resources/Textures/Tiles/checker_dark.png b/Resources/Textures/Tiles/checker_dark.png index 01a91209588..3eefdfa34da 100644 Binary files a/Resources/Textures/Tiles/checker_dark.png and b/Resources/Textures/Tiles/checker_dark.png differ diff --git a/Resources/Textures/Tiles/clown.png b/Resources/Textures/Tiles/clown.png index 74e59719235..d81a759b12c 100644 Binary files a/Resources/Textures/Tiles/clown.png and b/Resources/Textures/Tiles/clown.png differ diff --git a/Resources/Textures/Tiles/dark.png b/Resources/Textures/Tiles/dark.png index 70d0a801fdc..5574f32a19d 100644 Binary files a/Resources/Textures/Tiles/dark.png and b/Resources/Textures/Tiles/dark.png differ diff --git a/Resources/Textures/Tiles/dark_diagonal.png b/Resources/Textures/Tiles/dark_diagonal.png index d9cacd31e13..22b474995a4 100644 Binary files a/Resources/Textures/Tiles/dark_diagonal.png and b/Resources/Textures/Tiles/dark_diagonal.png differ diff --git a/Resources/Textures/Tiles/dark_diagonal_mini.png b/Resources/Textures/Tiles/dark_diagonal_mini.png index c60af49c6d7..12a1e64b421 100644 Binary files a/Resources/Textures/Tiles/dark_diagonal_mini.png and b/Resources/Textures/Tiles/dark_diagonal_mini.png differ diff --git a/Resources/Textures/Tiles/dark_herringbone.png b/Resources/Textures/Tiles/dark_herringbone.png index 01e0c4ef60e..88b13a43b3f 100644 Binary files a/Resources/Textures/Tiles/dark_herringbone.png and b/Resources/Textures/Tiles/dark_herringbone.png differ diff --git a/Resources/Textures/Tiles/dark_mini.png b/Resources/Textures/Tiles/dark_mini.png index 02c75c56c4f..aeb982b732b 100644 Binary files a/Resources/Textures/Tiles/dark_mini.png and b/Resources/Textures/Tiles/dark_mini.png differ diff --git a/Resources/Textures/Tiles/dark_mono.png b/Resources/Textures/Tiles/dark_mono.png index 9e156c6e023..279a72f4097 100644 Binary files a/Resources/Textures/Tiles/dark_mono.png and b/Resources/Textures/Tiles/dark_mono.png differ diff --git a/Resources/Textures/Tiles/dark_offset.png b/Resources/Textures/Tiles/dark_offset.png index ca8a5b64aaa..422811bd8f9 100644 Binary files a/Resources/Textures/Tiles/dark_offset.png and b/Resources/Textures/Tiles/dark_offset.png differ diff --git a/Resources/Textures/Tiles/dark_pavement.png b/Resources/Textures/Tiles/dark_pavement.png index 1585211593b..6ad0bc4209b 100644 Binary files a/Resources/Textures/Tiles/dark_pavement.png and b/Resources/Textures/Tiles/dark_pavement.png differ diff --git a/Resources/Textures/Tiles/dark_pavement_vertical.png b/Resources/Textures/Tiles/dark_pavement_vertical.png index 776aaf605ec..02f7735dcd5 100644 Binary files a/Resources/Textures/Tiles/dark_pavement_vertical.png and b/Resources/Textures/Tiles/dark_pavement_vertical.png differ diff --git a/Resources/Textures/Tiles/dark_plastic.png b/Resources/Textures/Tiles/dark_plastic.png index 34c3e57ce68..79e0ff407e6 100644 Binary files a/Resources/Textures/Tiles/dark_plastic.png and b/Resources/Textures/Tiles/dark_plastic.png differ diff --git a/Resources/Textures/Tiles/glass.png b/Resources/Textures/Tiles/glass.png index 37adc67679e..bc782a9c6c3 100644 Binary files a/Resources/Textures/Tiles/glass.png and b/Resources/Textures/Tiles/glass.png differ diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png index 1628c20ae77..c215175c499 100644 Binary files a/Resources/Textures/Tiles/green_circuit.png and b/Resources/Textures/Tiles/green_circuit.png differ diff --git a/Resources/Textures/Tiles/hydro.png b/Resources/Textures/Tiles/hydro.png index 5878bce5b70..0d1c6fef23f 100644 Binary files a/Resources/Textures/Tiles/hydro.png and b/Resources/Textures/Tiles/hydro.png differ diff --git a/Resources/Textures/Tiles/kitchen.png b/Resources/Textures/Tiles/kitchen.png index 83f371e63b8..38d4181bb08 100644 Binary files a/Resources/Textures/Tiles/kitchen.png and b/Resources/Textures/Tiles/kitchen.png differ diff --git a/Resources/Textures/Tiles/laundry.png b/Resources/Textures/Tiles/laundry.png index 60f079498ab..e89ae3d14cb 100644 Binary files a/Resources/Textures/Tiles/laundry.png and b/Resources/Textures/Tiles/laundry.png differ diff --git a/Resources/Textures/Tiles/lime.png b/Resources/Textures/Tiles/lime.png index bf528d278bd..3d421f3f7f6 100644 Binary files a/Resources/Textures/Tiles/lime.png and b/Resources/Textures/Tiles/lime.png differ diff --git a/Resources/Textures/Tiles/mime.png b/Resources/Textures/Tiles/mime.png index fee58f73708..bd85fa6111e 100644 Binary files a/Resources/Textures/Tiles/mime.png and b/Resources/Textures/Tiles/mime.png differ diff --git a/Resources/Textures/Tiles/plastic.png b/Resources/Textures/Tiles/plastic.png index 8fd68090319..8b004d5164b 100644 Binary files a/Resources/Textures/Tiles/plastic.png and b/Resources/Textures/Tiles/plastic.png differ diff --git a/Resources/Textures/Tiles/plating.png b/Resources/Textures/Tiles/plating.png index fef6a3554d5..5bdbadaa6ae 100644 Binary files a/Resources/Textures/Tiles/plating.png and b/Resources/Textures/Tiles/plating.png differ diff --git a/Resources/Textures/Tiles/plating_burnt.png b/Resources/Textures/Tiles/plating_burnt.png index 7c89de081eb..899e6c91880 100644 Binary files a/Resources/Textures/Tiles/plating_burnt.png and b/Resources/Textures/Tiles/plating_burnt.png differ diff --git a/Resources/Textures/Tiles/red_circuit.png b/Resources/Textures/Tiles/red_circuit.png new file mode 100644 index 00000000000..d7cee0fb61f Binary files /dev/null and b/Resources/Textures/Tiles/red_circuit.png differ diff --git a/Resources/Textures/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png index bae2908132b..6dd3bb59172 100644 Binary files a/Resources/Textures/Tiles/rglass.png and b/Resources/Textures/Tiles/rglass.png differ diff --git a/Resources/Textures/Tiles/shuttleblack.png b/Resources/Textures/Tiles/shuttleblack.png index e5dc3ff666f..8f3981a39f4 100644 Binary files a/Resources/Textures/Tiles/shuttleblack.png and b/Resources/Textures/Tiles/shuttleblack.png differ diff --git a/Resources/Textures/Tiles/shuttleblue.png b/Resources/Textures/Tiles/shuttleblue.png index 8a57cf8b0a1..98d7ea81d80 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 index 337fef7d30d..8ffd372ab06 100644 Binary files a/Resources/Textures/Tiles/shuttlegrey.png and b/Resources/Textures/Tiles/shuttlegrey.png differ diff --git a/Resources/Textures/Tiles/shuttleorange.png b/Resources/Textures/Tiles/shuttleorange.png index 0e42ad3467d..904d236f864 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 2236948d382..05601b839f6 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 732cf385d64..8757c81aadc 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 1308a78d9e4..db7513c5acb 100644 Binary files a/Resources/Textures/Tiles/shuttlewhite.png and b/Resources/Textures/Tiles/shuttlewhite.png differ diff --git a/Resources/Textures/Tiles/steel.png b/Resources/Textures/Tiles/steel.png index b7792ef138e..e5a1ed2879a 100644 Binary files a/Resources/Textures/Tiles/steel.png and b/Resources/Textures/Tiles/steel.png differ diff --git a/Resources/Textures/Tiles/steel_diagonal.png b/Resources/Textures/Tiles/steel_diagonal.png index 0f540532955..b0c1f6927d0 100644 Binary files a/Resources/Textures/Tiles/steel_diagonal.png and b/Resources/Textures/Tiles/steel_diagonal.png differ diff --git a/Resources/Textures/Tiles/steel_diagonal_mini.png b/Resources/Textures/Tiles/steel_diagonal_mini.png index 0b56a7794d2..51cbdf8b040 100644 Binary files a/Resources/Textures/Tiles/steel_diagonal_mini.png and b/Resources/Textures/Tiles/steel_diagonal_mini.png differ diff --git a/Resources/Textures/Tiles/steel_dirty.png b/Resources/Textures/Tiles/steel_dirty.png index 660fdf88685..fda6fabe1fc 100644 Binary files a/Resources/Textures/Tiles/steel_dirty.png and b/Resources/Textures/Tiles/steel_dirty.png differ diff --git a/Resources/Textures/Tiles/steel_herringbone.png b/Resources/Textures/Tiles/steel_herringbone.png index 2f676827d7a..19ae3bb8717 100644 Binary files a/Resources/Textures/Tiles/steel_herringbone.png and b/Resources/Textures/Tiles/steel_herringbone.png differ diff --git a/Resources/Textures/Tiles/steel_mini.png b/Resources/Textures/Tiles/steel_mini.png index 40a8706441a..8fa958f3fe5 100644 Binary files a/Resources/Textures/Tiles/steel_mini.png and b/Resources/Textures/Tiles/steel_mini.png differ diff --git a/Resources/Textures/Tiles/steel_mono.png b/Resources/Textures/Tiles/steel_mono.png index 94121926a3d..a2a72581e08 100644 Binary files a/Resources/Textures/Tiles/steel_mono.png and b/Resources/Textures/Tiles/steel_mono.png differ diff --git a/Resources/Textures/Tiles/steel_offset.png b/Resources/Textures/Tiles/steel_offset.png index 850daeffd5c..796fbcd5955 100644 Binary files a/Resources/Textures/Tiles/steel_offset.png and b/Resources/Textures/Tiles/steel_offset.png differ diff --git a/Resources/Textures/Tiles/steel_pavement.png b/Resources/Textures/Tiles/steel_pavement.png index 5b561e9ae65..200471ea995 100644 Binary files a/Resources/Textures/Tiles/steel_pavement.png and b/Resources/Textures/Tiles/steel_pavement.png differ diff --git a/Resources/Textures/Tiles/steel_pavement_vertical.png b/Resources/Textures/Tiles/steel_pavement_vertical.png index 1c38de21e7a..950a2c0e5f1 100644 Binary files a/Resources/Textures/Tiles/steel_pavement_vertical.png and b/Resources/Textures/Tiles/steel_pavement_vertical.png differ diff --git a/Resources/Textures/Tiles/white.png b/Resources/Textures/Tiles/white.png index 0ec2c911915..048c1fe179c 100644 Binary files a/Resources/Textures/Tiles/white.png and b/Resources/Textures/Tiles/white.png differ diff --git a/Resources/Textures/Tiles/white_diagonal.png b/Resources/Textures/Tiles/white_diagonal.png index e25e448a710..e9d52ab7d98 100644 Binary files a/Resources/Textures/Tiles/white_diagonal.png and b/Resources/Textures/Tiles/white_diagonal.png differ diff --git a/Resources/Textures/Tiles/white_diagonal_mini.png b/Resources/Textures/Tiles/white_diagonal_mini.png index 736733753a6..e4e32c65cd9 100644 Binary files a/Resources/Textures/Tiles/white_diagonal_mini.png and b/Resources/Textures/Tiles/white_diagonal_mini.png differ diff --git a/Resources/Textures/Tiles/white_herringbone.png b/Resources/Textures/Tiles/white_herringbone.png index fef9466a174..80d006810bf 100644 Binary files a/Resources/Textures/Tiles/white_herringbone.png and b/Resources/Textures/Tiles/white_herringbone.png differ diff --git a/Resources/Textures/Tiles/white_mini.png b/Resources/Textures/Tiles/white_mini.png index b0fc32c2c83..717ec462c44 100644 Binary files a/Resources/Textures/Tiles/white_mini.png and b/Resources/Textures/Tiles/white_mini.png differ diff --git a/Resources/Textures/Tiles/white_mono.png b/Resources/Textures/Tiles/white_mono.png index 66eedee0f69..763f08b9d20 100644 Binary files a/Resources/Textures/Tiles/white_mono.png and b/Resources/Textures/Tiles/white_mono.png differ diff --git a/Resources/Textures/Tiles/white_offset.png b/Resources/Textures/Tiles/white_offset.png index 19537e3896b..0b6239a3249 100644 Binary files a/Resources/Textures/Tiles/white_offset.png and b/Resources/Textures/Tiles/white_offset.png differ diff --git a/Resources/Textures/Tiles/white_pavement.png b/Resources/Textures/Tiles/white_pavement.png index 78fcf0195d2..69da122ba61 100644 Binary files a/Resources/Textures/Tiles/white_pavement.png and b/Resources/Textures/Tiles/white_pavement.png differ diff --git a/Resources/Textures/Tiles/white_pavement_vertical.png b/Resources/Textures/Tiles/white_pavement_vertical.png index 5126f699db5..20d887903c5 100644 Binary files a/Resources/Textures/Tiles/white_pavement_vertical.png and b/Resources/Textures/Tiles/white_pavement_vertical.png differ diff --git a/Resources/Textures/Tiles/white_plastic.png b/Resources/Textures/Tiles/white_plastic.png index 99d6c60e881..b31ea0e8553 100644 Binary files a/Resources/Textures/Tiles/white_plastic.png and b/Resources/Textures/Tiles/white_plastic.png differ