diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 6cf09a14227..26706a0a934 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -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' diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 0e1756c8fc6..5472e3ae0b7 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -21,3 +21,6 @@ ent-ADTPlushieMigel = плюшевый Мигель ent-ADTPlushieTeo = плюшевый Тео .desc = Он мрачен, как грозовая туча. +ent-ADTPlushieDekus = плюшевый Декус-Га + .desc = Это милый, ярко красный унатх в форме Квартирмейстера. Так и хочется его погладить. + diff --git a/Resources/Locale/ru-RU/ADT/Objects/Misc/EvidanceBag.ftl b/Resources/Locale/ru-RU/ADT/Objects/Misc/EvidanceBag.ftl index f07c91f4c13..1d145b10c50 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Misc/EvidanceBag.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Misc/EvidanceBag.ftl @@ -1,2 +1,8 @@ ent-ADTEvidanceBag = пакетик для улик - .desc = создан для хранения улик, а не наркотиков. + .desc = Cоздан для хранения улик, а не наркотиков. + +ent-ADTPillExperimental = космическая трава + .desc = Зелёная измельчённая трава, интересно что же это такое... + +ent-ADTPillExter = экстэриал витамины + .desc = На вид обычные разноцветные витаминки. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 23b11fc6889..0e068424986 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -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 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml index b7bb58dbf8c..f67704ecbee 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml @@ -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 + + + diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 027d286736f..3e620df017c 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -124,14 +124,17 @@ { "name": "shark_inhand-right" }, - { + { "name": "plushie_jungar" }, - { + { "name": "plushie_migel" }, - { + { "name": "plushie_teo" + }, + { + "name": "plushie_dekus" } ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_dekus.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_dekus.png new file mode 100644 index 00000000000..1751c568b34 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_dekus.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/meta.json index 3233310b75c..1ce7e5a4ae4 100644 --- a/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/meta.json @@ -9,6 +9,12 @@ "states": [ { "name": "icon" + }, + { + "name": "place_number" + }, + { + "name": "place_number2" } ] } diff --git a/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number.png b/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number.png new file mode 100644 index 00000000000..9ccd9feff87 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number2.png b/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number2.png new file mode 100644 index 00000000000..c05c976dac2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/extezi_ent.png b/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/extezi_ent.png new file mode 100644 index 00000000000..5b09dcd7f2b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/extezi_ent.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/meta.json new file mode 100644 index 00000000000..89f3aa8b564 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/meta.json @@ -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" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/trava_ent.png b/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/trava_ent.png new file mode 100644 index 00000000000..bf73fdea443 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/trava_ent.png differ