Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

текстуры, которые я добавила отдельными коммитами #33

Merged
merged 11 commits into from
Jun 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 1 addition & 43 deletions Resources/Prototypes/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
collection: FootstepHull
itemDrop: FloorTileItemBrassFilled
heatCapacity: 10000

- type: tile
id: FloorBrassReebe
name: tiles-brass-floor-reebe
Expand Down Expand Up @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand All @@ -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 ]
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by @mishutka09, fix digi sprites by DreamlyJack" ,
"copyright": "drawn by tamioki(discord)",
"size": {
"x": 32,
"y": 32
Expand All @@ -10,10 +10,6 @@
{
"name": "icon"
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "equipped-FEET",
"directions": 4
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by @mishutka09, fix digi sprites by DreamlyJack" ,
"copyright": "drawn by tamioki(discord)" ,
"size": {
"x": 32,
"y": 32
Expand All @@ -10,10 +10,6 @@
{
"name": "icon"
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "equipped-FEET",
"directions": 4
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by @mishutka09, fis digi sprites by DreamlyJack" ,
"copyright": "drawn by tamioki(discord)" ,
"size": {
"x": 32,
"y": 32
Expand All @@ -14,10 +14,6 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by @mishutka09, fix digi sprites by DreamlyJack" ,
"copyright": "drawn by tamioki(discord)" ,
"size": {
"x": 32,
"y": 32
Expand All @@ -10,10 +10,6 @@
{
"name": "icon"
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "equipped-FEET",
"directions": 4
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by @mishutka09, fix digi sprites by DreamlyJack" ,
"copyright": "drawn by tamioki(discord)" ,
"size": {
"x": 32,
"y": 32
Expand All @@ -14,10 +14,6 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by @mishutka09, fix sprites by DreamlyJack" ,
"copyright": "drawn by tamioki(discord)" ,
"size": {
"x": 32,
"y": 32
Expand All @@ -14,10 +14,6 @@
"name": "equipped-FEET",
"directions": 4
},
{
"name": "equipped-FEET-reptilian",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
Expand Down
Binary file modified Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
Binary file modified Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_box.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_end_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_inner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/dark_line_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_box.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_end_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_inner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/steel_line_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_box.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_end_w.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_se.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_inner_sw.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_e.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_n.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_s.png
Binary file modified Resources/Textures/Decals/bricktile.rsi/white_line_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_box.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_corner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_end_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/dark_line_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_box.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_corner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_end_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_inner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/steel_line_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_box.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_corner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_end_w.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_ne.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_nw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_se.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_inner_sw.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_e.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_n.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_s.png
Binary file modified Resources/Textures/Decals/minitile.rsi/white_line_w.png
Binary file modified Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
Binary file modified Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/tree/23b5c47245804dd24507b75f250de5e87d34e294",
"copyright": "Taken from https://github.com/tgstation/tgstation",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -112,8 +112,6 @@
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
Expand Down
Binary file modified Resources/Textures/Structures/Machines/smartfridge.rsi/off.png
Binary file modified Resources/Textures/Structures/Wallmounts/air_monitors.rsi/fire0.png
Binary file modified Resources/Textures/Structures/Wallmounts/air_monitors.rsi/firex.png
Loading
Loading