Skip to content

Commit

Permalink
Merge pull request #269 from Schrodinger71/kotiki
Browse files Browse the repository at this point in the history
Котики
  • Loading branch information
Schrodinger71 authored Jan 2, 2024
2 parents 6726364 + 2615016 commit 7c23b08
Show file tree
Hide file tree
Showing 13 changed files with 164 additions and 10 deletions.
6 changes: 6 additions & 0 deletions Resources/Changelog/ChangelogADT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -985,3 +985,9 @@ Entries:
- {message: Добавлены два стража Нового Года - для того. чтобы никто не помешал празднику, type: Add}
id: 55655 #костыль отображения в Обновлениях
time: '2023-12-31T07:20:00.0000000+00:00'

- author: Шрёдингер
changes:
- {message: Добавлены новые предметы для ивента, type: Add}
id: 55656 #костыль отображения в Обновлениях
time: '2024-01-02T07:20:00.0000000+00:00'
3 changes: 3 additions & 0 deletions Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ ent-ADTPlushieMigel = плюшевый Мигель
ent-ADTPlushieTeo = плюшевый Тео
.desc = Он мрачен, как грозовая туча.
ent-ADTPlushieDekus = плюшевый Декус-Га
.desc = Это милый, ярко красный унатх в форме Квартирмейстера. Так и хочется его погладить.
8 changes: 7 additions & 1 deletion Resources/Locale/ru-RU/ADT/Objects/Misc/EvidanceBag.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
ent-ADTEvidanceBag = пакетик для улик
.desc = создан для хранения улик, а не наркотиков.
.desc = Cоздан для хранения улик, а не наркотиков.
ent-ADTPillExperimental = космическая трава
.desc = Зелёная измельчённая трава, интересно что же это такое...
ent-ADTPillExter = экстэриал витамины
.desc = На вид обычные разноцветные витаминки.
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -504,3 +504,13 @@
- type: Sprite
sprite: ADT/Objects/Fun/toys.rsi
state: plushie_teo

- type: entity
parent: BasePlushie
id: ADTPlushieDekus
name: Djessie plushie
description: It looks like a soft and cute blondie.
components:
- type: Sprite
sprite: ADT/Objects/Fun/toys.rsi
state: plushie_dekus
114 changes: 108 additions & 6 deletions Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,116 @@
- type: Tag
id: ADTPillExperimental

- type: Tag
id: ADTPillExter

- type: entity
id: ADTEvidanceBag
name: Evidance Bag
parent: BaseStorageItem
parent: BaseItem
description: Designed to store evidence, not drugs
components:
- type: Appearance
- type: Sprite
sprite: ADT/Objects/Misc/Evidance.rsi
state: icon
scale: 0.7, 0.7
- type: Storage
grid:
- 0,0,10,7
maxItemSize: Small
scale: 0.6, 0.6
- type: ItemSlots
slots:
place:
name: Place
#startingItem: null
priority: 1
whitelist:
tags:
- ADTPillExperimental
- ADTPillExter
- type: ItemMapper
mapLayers:
place_number:
whitelist:
tags:
- ADTPillExperimental
place_number2:
whitelist:
tags:
- ADTPillExter
sprite: ADT/Objects/Misc/Evidance.rsi
- type: ContainerContainer
containers:
place: !type:ContainerSlot

- type: entity
name: pill
parent: FoodInjectableBase
id: ADTPillExperimental
description: It's not a suppository.
components:
- type: SliceableFood
count: 2
- type: Sprite
sprite: ADT/Objects/Misc/pill_ex.rsi
state: trava_ent
scale: 0.6, 0.6
- type: Item
size: Tiny
- type: Tag
tags:
- ADTPillExperimental
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: SpaceDrugs
Quantity: 15
- ReagentId: Nocturine
Quantity: 15

- type: entity
name: pill
parent: FoodInjectableBase
id: ADTPillExter
description: It's not a suppository.
components:
- type: SliceableFood
count: 2
- type: Sprite
sprite: ADT/Objects/Misc/pill_ex.rsi
state: extezi_ent
scale: 0.6, 0.6
- type: Item
size: Tiny
- type: Tag
tags:
- ADTPillExter
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Stimulants
Quantity: 15
- ReagentId: SpaceDrugs
Quantity: 15

#Stimulants SpaceDrugs Nocturine
# - type: SolutionContainerManager
# solutions:
# smokable:
# maxVol: 45
# reagents:
# - ReagentId: Nicotine
# Quantity: 40
# - ReagentId: Omnizine
# Quantity: 5
# - type: SolutionContainerManager
# solutions:
# food:
# maxVol: 20
# reagents:
# - ReagentId: Bicaridine
# Quantity: 10



9 changes: 6 additions & 3 deletions Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,17 @@
{
"name": "shark_inhand-right"
},
{
{
"name": "plushie_jungar"
},
{
{
"name": "plushie_migel"
},
{
{
"name": "plushie_teo"
},
{
"name": "plushie_dekus"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions Resources/Textures/ADT/Objects/Misc/Evidance.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"states": [
{
"name": "icon"
},
{
"name": "place_number"
},
{
"name": "place_number2"
}
]
}
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.
18 changes: 18 additions & 0 deletions Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:yamato_no_orochi8 by Adveture Time",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "trava_ent"
},
{
"name": "extezi_ent"
}
]
}

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 7c23b08

Please sign in to comment.