Skip to content

Commit

Permalink
Merge pull request #115 from Schrodinger71/new-update-7
Browse files Browse the repository at this point in the history
Мелкая обнова, новый анимированный плакат и респрайт ботаники.
  • Loading branch information
Schrodinger71 authored Nov 13, 2023
2 parents 53b30b7 + d1d4d17 commit f9241bd
Show file tree
Hide file tree
Showing 37 changed files with 39 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -291,3 +291,7 @@ ent-ADTPosterPassTheBanana = "Передайте банан ниже!"
ent-ADTPosterLegitEfficiency = диаграмма трудовой эффективности
.desc = Центральное командование приводит статистику, где зарплаты сотрудников превышают более 2х процентов от общей прибыли с денег, которые приносит их труд и заявляет, что это самые неутешительные результаты за последние 120 лет.
ent-ADTPosterDontSitDown = ""Не садись!"
.desc = Голографический плакат с изображением показывающим насколько могут быть опасны мензурки.
.suffix = { "День рождения сервера" }
Original file line number Diff line number Diff line change
Expand Up @@ -486,3 +486,18 @@
- type: Sprite
sprite: ADT/Objects/Decoration/triangles_birthday.rsi
state: ryright

- type: entity
parent: PosterBase
id: ADTPosterDontSitDown
name: "Don not sit down"
description: "Don not sit down"
suffix: One Year
components:
- type: Sprite
sprite: ADT/Objects/Decoration/dontsitdown.rsi
state: dontsitdown
- type: PointLight
radius: 3
energy: 2
color: cyan
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
@@ -0,0 +1,20 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:yamato_no_orochi8",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "dontsitdown",
"delays": [
[
0.7,
0.7
]
]
}
]
}
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.
Binary file modified Resources/Textures/Clothing/Head/Bandanas/botany.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.
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.
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/Objects/Tools/Hydroponics/hatchet.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.
Binary file modified Resources/Textures/Objects/Tools/Hydroponics/hoe.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.
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.
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/Objects/Tools/Hydroponics/spade.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.

0 comments on commit f9241bd

Please sign in to comment.