From 89053449a918480b8260ee473b28ed1c0b4e3506 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Tue, 2 Jan 2024 04:23:31 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9A=D0=BE=D1=82=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Misc/EvidenceBag.yml | 127 +++++++++++++++++- .../ADT/Objects/Misc/Evidance.rsi/meta.json | 6 + .../Misc/Evidance.rsi/place_number.png | Bin 0 -> 1162 bytes .../Misc/Evidance.rsi/place_number2.png | Bin 0 -> 527 bytes .../Objects/Misc/pill_ex.rsi/extezi_ent.png | Bin 0 -> 384 bytes .../ADT/Objects/Misc/pill_ex.rsi/meta.json | 18 +++ .../Objects/Misc/pill_ex.rsi/trava_ent.png | Bin 0 -> 778 bytes 7 files changed, 145 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number.png create mode 100644 Resources/Textures/ADT/Objects/Misc/Evidance.rsi/place_number2.png create mode 100644 Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/extezi_ent.png create mode 100644 Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Misc/pill_ex.rsi/trava_ent.png diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml index b7bb58dbf8c..3e9a8f07f9b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml @@ -1,14 +1,129 @@ +- 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: Transform + # anchored: true + - 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: PillCopper + id: ADTPillExperimental + description: It's not a suppository. + components: + - 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: PillCopper + id: ADTPillExter + description: It's not a suppository. + components: + - 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 + +# - type: entity +# name: pill +# parent: Pill +# id: ADTPillExperimental +# description: It's not a suppository. +# components: +# - type: Sprite +# sprite: Objects/Specific/Chemistry/pills.rsi +# state: pill +# - type: Item +# size: Tiny +# sprite: Objects/Specific/Chemistry/pills.rsi +# - type: Tag +# tags: +# - ADTPillExperimental + + 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 0000000000000000000000000000000000000000..9ccd9feff87e08bcfddbb543e2040184141f48a1 GIT binary patch literal 1162 zcmV;51aPx#1ZP1_K>z@;j|==^1poj98c9S!R9HvtSKDsmR1{r~oy3lFtCO^yPMfx9BqV4D zhJg+xyi7lY7yko~Jn%T5!H4v%LSkMJ3`nR<(dYsunMmK%z@J zI{Vl<>nyLmk9~~)J(#GE;rRIY2Zmwt6y~TG7T3Zsw5hYA*!cVX=-w@E<}7eCZ!u>v zJ~}%3X3^i^UIAac!KYF9;CTBjevZN=k{tN{K0mOf5>y&gK3y({&^~MY#QV77^>2d73D$} zR|@D~oy(K4D*K)-XSfW~>6t7DX}PBkzU7UCN=#yC6o?~iEQ7Q2-tvNA-$O~!Mj)iLVDRwrVTod0xatg{K ze0bDCcykZMQUSi7A}4HYZ*QR4RKN=i#Wn2h??KT95OW;H69bAe1IIAbSa`k*$C;pg z(T$knNEC3T43W!ZVc81;102gD&-h3Y;aJ!4HNb(T9uIDIAk*dgp!EW^%{I9 zAe*an5=vpHPf)8BP$(2}de*`&xs?hX%&2beL!yAu$Og-^C=_{2Ed$Qn1j{kF==C5~ zR=~0;OwAcNWFTKG(#a+y!4A3Qzzsrlx-D{qfj!kg#YsH3r?eOn1vst+*QFZpJq-Gk z4n9vsW>elpG|!uK-=;-bdTKHz2WZ*|Gs}Z(kl6uHDps*p;n8XhkxAz;9BL7B9Ek!_ zWTzxi;ei96Vqs9;cj{y(WpnN_)O>of+44-+?WkCdV| ziPLB|Wv_|vAW=Y(@|$J?%B6@brJ`DvpkDQ8cd^*2*Wr=XQh9}X9a~#l2m%+~?ugQn zg&(@GW)`kgl~Oc-HD@rLOd{qu5(QXOo!*2)Jl}hXFcm(#VWiXE52+?B2LXv2DGDUoy2gaw1C=5wwR*%HN1_0ZOVa`jetY*T4!?Sh0=Zy? z0W8WfxsPnV0ESyUtw(7HP%dSuNVDWho@$3g1SzQ61WHduQCz{G`#xfhBT;~9gn0IB z7eix&w?F-e4?jM@{{EMEb=bhyjRszP@)GsUI>oQ?`N1Lf_g*d2cG=fp)Azz#Y+G_f zs+KUBsFa#Q#2m-H{{;&y{tcq=!EpDV;1T};0Dl2|NY>_JJ`i63000hUSV?A0O#mtY c000O800000007cclK=n!07*qoM6N<$g5!D)-v9sr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c05c976dac208f4c26b5c93336abef082e8bf9a7 GIT binary patch literal 527 zcmV+q0`UEbP)Px$$w@>(R9J=Wmpy9~Q51%s+1)G{R>9RIOw1RGELa4_2`FrL3&Bd!J{HISV5Nnr zZ2SdYko*QAR#Rn>K(1>Mk&q@a=q5(iVuHraWX2-9aYII(Sr;svx4N8r&v~D7?k#5E zf0q>(^gM6gvaAv?Xj#@NfGCQ-0bkqe-R}MN-p``#obJ3Rigp2%QnTG>3vmDsmeteV zdrGHRfG0EFom#Cn+HbRJwfa$^-gL)u{WeLf3?Ku@05X6KAOpw%dIoTeEsn9}p8@ns zi2y=>PeOn1sN1pEMs}?c{T`m`1bfL%HsFNaPCW-b*# z^Yme2nYs>*kq~5a;w~HGQ%nx6Yk+NI1cQvYuI}U=*sI#9d=WtEt7r8u$^!|mVEW9~ zpN<@werUR002ovPDHLkV1mwx@|6Gp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5b09dcd7f2b9a9e799b809e8b29ec04de8eb0d5a GIT binary patch literal 384 zcmV-`0e}99P)Px$I!Q!9R9J=W(!EN2WaPS)K1->{m!;3swjz&qTx04`>f0KCft0M4CXGb6oG5P)QMq3LXZ&X&$?U~}0I zjpWqV0ub};(1X5>z{zNFGFqlegHU?LS4yH=d3lJ;(jzt_L@4t_T&bGH$?SqPKK+O; zZ2zbuZRtR2-IeaHPmZs=y1$Hhw$(qGqw=~EdQiih(t0k)(=J+i_f`P%FZTe9jrN`c z41Dyh0+in>q|Wv%?F1dLkAe;yB!UR$*NO}cU)JqwxdS)XC)VOpTwK?URv$$heoz&* e+%OE|Pxt~O+g$@?Nc7SG0000Px#1ZP1_K>z@;j|==^1poj7nn^@KR9Hvtl-o;_aTv!x+q=2xyE$K{^SInR%rZr! z%(PMqqw_&4lpu&ADCke{qW*<$0=q1TD7pxWPC^KkdZA`$hNY%$=3&lu%DK6>MY~hO zb0CE%Z-$ZEjhuwW~a@Ooz%9vS1}g_8+MY*=7-U5#u^(_l=| zBc+K*W(j*i9-*ZO@A^OD59-LVsIcYb)7sLsVTlb1RM~Cv^!#Ur1_xP~oS~-vDB9S_ z4ccY8-n?Xf&Vvy3q1I}6@bCp&%B^(VxV9mQKfd0xtqrnTNWnQZNscOl)tbfKu2Cv0 zw&EIhp%#-^{^3RyiL$M32f<*N@lP`p+Bf6=){A9RKFOvGI&R)uw~r9dRpe)<%c4Qc zyFM2>F-)n|7MoY(cT<0Ws49SGVFjZ>N8`Sod>EdS&lUhdCyj zjw(gQySRXFNg%wUp`o#C-F2)fphGQZSn^1cw0!r=NU5nDK2}Xn_ZZEmj-UzqF&Rwk zsjs4OS1tRSYH>Qp@p*$}<|YxAgRvXv@yyL3>IJ5!!tu(hSyP~5dnJWM*}U#~g{V`p z98vSOr3mDVe}uw60Db~u!RBmy22o!C000hUSV?A0O#mtY000O800000007cclK=n!07*qo IM6N<$g4P&lnE(I) literal 0 HcmV?d00001 From e3e4751574ddc4c5119cd36a9e7ff805edc8b058 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Tue, 2 Jan 2024 04:51:39 +0300 Subject: [PATCH 2/5] fix --- .../ADT/Entities/Objects/Misc/EvidenceBag.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml index 3e9a8f07f9b..12dd9930bb7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml @@ -44,7 +44,7 @@ - type: entity name: pill - parent: PillCopper + parent: Pill id: ADTPillExperimental description: It's not a suppository. components: @@ -69,7 +69,7 @@ - type: entity name: pill - parent: PillCopper + parent: Pill id: ADTPillExter description: It's not a suppository. components: @@ -110,20 +110,5 @@ # - ReagentId: Bicaridine # Quantity: 10 -# - type: entity -# name: pill -# parent: Pill -# id: ADTPillExperimental -# description: It's not a suppository. -# components: -# - type: Sprite -# sprite: Objects/Specific/Chemistry/pills.rsi -# state: pill -# - type: Item -# size: Tiny -# sprite: Objects/Specific/Chemistry/pills.rsi -# - type: Tag -# tags: -# - ADTPillExperimental From 775bd5406191d9841c01c87489bafcecde01802a Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Tue, 2 Jan 2024 16:09:57 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D1=8B,=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B=20yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/Objects/Misc/EvidanceBag.ftl | 8 +++++++- .../ADT/Entities/Objects/Misc/EvidenceBag.yml | 10 ++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) 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/Misc/EvidenceBag.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml index 12dd9930bb7..f67704ecbee 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/EvidenceBag.yml @@ -10,8 +10,6 @@ parent: BaseItem description: Designed to store evidence, not drugs components: - # - type: Transform - # anchored: true - type: Appearance - type: Sprite sprite: ADT/Objects/Misc/Evidance.rsi @@ -44,10 +42,12 @@ - type: entity name: pill - parent: 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 @@ -69,10 +69,12 @@ - type: entity name: pill - parent: 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 From dba84b9ccd8c7ca9e2c2df3c57a7d304f9b8c7be Mon Sep 17 00:00:00 2001 From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:38:51 +0300 Subject: [PATCH 4/5] Update ChangelogADT.yml --- Resources/Changelog/ChangelogADT.yml | 6 ++++++ 1 file changed, 6 insertions(+) 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' From 60f3198e475cc325a514a48e66687c74dbf9e2a7 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Tue, 2 Jan 2024 17:54:05 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=9F=D0=BB=D1=8E=D1=88=D0=B5=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=B8=D0=B3=D1=80=D1=83=D1=88=D0=BA=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BA=D1=83=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 3 +++ .../Prototypes/ADT/Entities/Objects/Fun/toys.yml | 10 ++++++++++ .../Textures/ADT/Objects/Fun/toys.rsi/meta.json | 9 ++++++--- .../ADT/Objects/Fun/toys.rsi/plushie_dekus.png | Bin 0 -> 962 bytes 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_dekus.png 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/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/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 0000000000000000000000000000000000000000..1751c568b34d4788a5d3788515f5c0378858159e GIT binary patch literal 962 zcmV;z13mnSP)A}r=G8eI#O_cd_oXEMeAuBKC0Vsz3tX=(`J(l*~l5}R|d(qjolTau~^ujfoe?P;%NP870IZ(i@IH6~lP$-CRcN>|d+m=L_ z)PdgePU+-000hU kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f(>QYQvd(} literal 0 HcmV?d00001