Skip to content

Commit

Permalink
Merge pull request #116 from PyotrIgn/birthday_fix
Browse files Browse the repository at this point in the history
Фиксы контента ко дню рождения проекта
  • Loading branch information
PyotrIgn authored Nov 13, 2023
2 parents f9241bd + 7027b8b commit cc3fe7f
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 7 deletions.
8 changes: 8 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -568,3 +568,11 @@ Entries:
- {message: Разблокировка Новакидов, type: Fix}
id: 55607 #костыль отображения в Обновлениях
time: '2023-11-14T07:40:00.0000000+00:00'

- author: Петр Игнатьевич
changes:
- {message: Фикс вместимости коробки из под И.Р.П., type: Fix}
- {message: Фикс размеров капсулы клонирования и медицинского сканера - теперь они должны пролезать через двери., type: Fix}
- {message: Фикс спрайтов некоторых вещей ко Дню Рождения Сервера., type: Fix}
id: 55606 #костыль отображения в Обновлениях
time: '2023-11-14T01:20:00.0000000+00:00'
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@ ent-ADTPosterPassTheBanana = "Передайте банан ниже!"
ent-ADTPosterLegitEfficiency = диаграмма трудовой эффективности
.desc = Центральное командование приводит статистику, где зарплаты сотрудников превышают более 2х процентов от общей прибыли с денег, которые приносит их труд и заявляет, что это самые неутешительные результаты за последние 120 лет.
ent-ADTPosterDontSitDown = ""Не садись!"
ent-ADTPosterDontSitDown = "Не садись!"
.desc = Голографический плакат с изображением показывающим насколько могут быть опасны мензурки.
.suffix = { "День рождения сервера" }
ent-ADTPosterContrabandLustArDeco = таяранское ар-деко
.desc = На плакате изображена таяранка в привлекательной позе и наряде в стиле ар-деко.
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,15 @@
- type: Sprite
state: poster_adtlustuma_contraband #Спрайт от Празата

- type: entity
parent: PosterBase
id: ADTPosterContrabandLustArDeco
name: Tayaran ArDeco
description: "A poster with tayaran women of attractive appearance and in ar deco suit."
components:
- type: Sprite
state: poster_adtlustardeco_contraband #Спрайт от Празата

#картины

- type: entity
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@
description: A box of decades old military surplus rations. It is surprisingly not rotten.
components:
- type: Storage
maxItemSize: Large
maxTotalWeight: 100
maxItemSize: Normal
maxTotalWeight: 10
- type: StorageFill
contents:
- id: DrinkMREFlask # Size 8
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
- ADTPosterContrabandFearThem # Спрайт от Иллюми
- ADTPosterContrabandSilence # Спрайт от Иллюми
- ADTPosterContrabandLustUma
- ADTPosterContrabandLustArDeco
chance: 1

- type: entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: CloningPod
parent: BaseMachinePowered
name: cloning pod
Expand All @@ -25,7 +25,7 @@
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
bounds: "-0.2,-0.4,0.2,0.4"
density: 190
mask:
- MachineMask
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: MedicalScanner
parent: BaseMachinePowered
name: medical scanner
Expand Down Expand Up @@ -44,7 +44,7 @@
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.25,-0.5,0.25,0.5"
bounds: "-0.2,-0.4,0.2,0.4"
density: 190
mask:
- MachineMask
Expand Down
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.
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@
{
"name": "poster_adtlustuma_contraband"
},
{
"name": "poster_adtlustardeco_contraband"
},
{
"name": "poster52_contraband",
"directions": 1,
Expand Down
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 cc3fe7f

Please sign in to comment.