Skip to content

Commit

Permalink
хеллоуинские тайлы (я просто тестирую будет ли ругаться проверка) (#494)
Browse files Browse the repository at this point in the history
## О пулл реквесте
Добавил хеллоуинские тайлы и угловые каркасные решетки

## Почему / Баланс
Хеллоуинские - для возврата из старой сборки
Угловые каркасные тайлы решеток - для более красивых шаттлов и каркаса
вокруг станций

:cl:
- add: Возвращены хеллоуинские тайлы
- add: Для мапперов добавлены тайлы угловых каркасных решёток
  • Loading branch information
PyotrIgn authored Sep 21, 2024
1 parent c1ac61f commit 80f539e
Show file tree
Hide file tree
Showing 10 changed files with 132 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Resources/Locale/ru-RU/ADT/Tiles/tiles.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tiles-blackorange-floor = черно-оранжевая плитка
tiles-yelloworange-floor = желто-оранжевая плитка
tiles-lattice-left-upper = угловая решётка, лево-верх
tiles-lattice-left-lower = угловая решётка, лево-низ
tiles-lattice-right-upper = угловая решётка, право-верх
tiles-lattice-right-lower = угловая решётка, право-низ
33 changes: 33 additions & 0 deletions Resources/Prototypes/ADT/Tiles/floors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- type: tile
id: ADTFloorBlackOrange
name: tiles-blackorange-floor
sprite: /Textures/ADT/Tiles/blackorange.png
variants: 3
placementVariants:
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
#canCrowbar: true
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000

- type: tile
id: ADTFloorYellowOrange
name: tiles-yelloworange-floor
sprite: /Textures/ADT/Tiles/yelloworange.png
variants: 3
placementVariants:
- 1.0
- 1.0
- 1.0
baseTurf: Plating
isSubfloor: false
#canCrowbar: true
footstepSounds:
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000
63 changes: 63 additions & 0 deletions Resources/Prototypes/ADT/Tiles/plating.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
- type: tile
id: ADTLatticeLeftUpper
name: tiles-lattice-left-upper
sprite: /Textures/ADT/Tiles/lattice_left_upper.png
baseTurf: Space
isSubfloor: true
deconstructTools: [ Cutting ]
weather: true
#canCrowbar: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
isSpace: true
itemDrop: PartRodMetal1
heatCapacity: 10000

- type: tile
id: ADTLatticeLeftLower
name: tiles-lattice-left-lower
sprite: /Textures/ADT/Tiles/lattice_left_lower.png
baseTurf: Space
isSubfloor: true
deconstructTools: [ Cutting ]
weather: true
#canCrowbar: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
isSpace: true
itemDrop: PartRodMetal1
heatCapacity: 10000

- type: tile
id: ADTLatticeRightUpper
name: tiles-lattice-right-upper
sprite: /Textures/ADT/Tiles/lattice_right_upper.png
baseTurf: Space
isSubfloor: true
deconstructTools: [ Cutting ]
weather: true
#canCrowbar: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
isSpace: true
itemDrop: PartRodMetal1
heatCapacity: 10000

- type: tile
id: ADTLatticeRightLower
name: tiles-lattice-right-lower
sprite: /Textures/ADT/Tiles/lattice_right_lower.png
baseTurf: Space
isSubfloor: true
deconstructTools: [ Cutting ]
weather: true
#canCrowbar: true
footstepSounds:
collection: FootstepPlating
friction: 0.3
isSpace: true
itemDrop: PartRodMetal1
heatCapacity: 10000
29 changes: 29 additions & 0 deletions Resources/Textures/ADT/Tiles/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
- files: ["lattice_left_upper.png"]
license: "CC-BY-SA-3.0"
copyright: "Adventure Time MRP Server"
source: "https://github.com/AdventureTimeSS14/space_station_ADT"

- files: ["lattice_right_upper.png"]
license: "CC-BY-SA-3.0"
copyright: "Adventure Time MRP Server"
source: "https://github.com/AdventureTimeSS14/space_station_ADT"

- files: ["lattice_left_lower.png"]
license: "CC-BY-SA-3.0"
copyright: "Adventure Time MRP Server"
source: "https://github.com/AdventureTimeSS14/space_station_ADT"

- files: ["lattice_right_lower.png"]
license: "CC-BY-SA-3.0"
copyright: "Adventure Time MRP Server"
source: "https://github.com/AdventureTimeSS14/space_station_ADT"

- files: ["blackorange.png"]
license: "CC-BY-SA-3.0"
copyright: "Adventure Time MRP Server"
source: "https://github.com/AdventureTimeSS14/space_station_ADT"

- files: ["yelloworange"]
license: "CC-BY-SA-3.0"
copyright: "Adventure Time MRP Server"
source: "https://github.com/AdventureTimeSS14/space_station_ADT"
Binary file added Resources/Textures/ADT/Tiles/blackorange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Tiles/lattice_left_lower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Tiles/lattice_left_upper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Tiles/lattice_right_lower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Tiles/lattice_right_upper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/ADT/Tiles/yelloworange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 80f539e

Please sign in to comment.