From 60a3ea9fe2e1deb37128241072b42def44d6f4b5 Mon Sep 17 00:00:00 2001 From: Xelasto Date: Wed, 13 Dec 2023 19:27:46 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=81=D0=BB=D1=83=D1=88?= =?UTF-8?q?=D0=BA=D0=B0=20=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=B2=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ADT/Objects/Misc/wiretapping.ftl | 27 +++ .../ADT/Entities/Objects/Misc/wiretapping.yml | 102 ++++++++++ .../Objects/Specific/Medical/patch.yml | 181 ++++++++++++++++++ .../Objects/Misc/wiretapping.rsi/meta.json | 14 ++ .../Misc/wiretapping.rsi/wiretapping.png | Bin 0 -> 8318 bytes 5 files changed, 324 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml create mode 100644 Resources/Textures/ADT/Objects/Misc/wiretapping.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Misc/wiretapping.rsi/wiretapping.png diff --git a/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl b/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl new file mode 100644 index 00000000000..545aeb468f3 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl @@ -0,0 +1,27 @@ +ent-ADTWiretappingClothingHeadset = гарнитура прослушивающего устройства + .suffix = Ивент + .desc = Разработана для проведения специальных операций спецподразделениями НТ. + +ent-ADTWiretappingEncryptionKey = ключ шифрования прослушивающего устройства + .suffix = Ивент + .desc = + +ent-ADTWiretapping = прослушивающее устройство + .suffix = Ивент + .desc = Специальное малогабаритное устройство прослушивания, разработанное специально для сотрудников специальных подразделений НТ. + +ent-ADTWiretappingPlushieBee = {ent-PlushieBee} + .suffix = Ивент,Прослушка + .desc = {ent-PlushieBee.desc} + +ent-ADTWiretappingPlushieSharkPink = {ent-PlushieSharkPink} + .suffix = Ивент,Прослушка + .desc = {ent-PlushieSharkPink.desc} + +ent-ADTWiretappingPlushieCarp = {ent-PlushieCarp} + .suffix = Ивент,Прослушка + .desc = {ent-PlushieCarp.desc} + +ent-ADTWiretappingPlushieSlime = {ent-PlushieSlime} + .suffix = Ивент,Прослушка + .desc = {ent-PlushieSlime.desc} diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml new file mode 100644 index 00000000000..8ddc5d91fcb --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml @@ -0,0 +1,102 @@ +- type: radioChannel + id: ADTWiretapping + name: Засекреченная линия + keycode: '\' + frequency: 1672 + color: "#ff144b" + longRange: true + +- type: entity + parent: EncryptionKey + id: ADTWiretappingEncryptionKey + name: common encryption key + description: An encryption key used by anyone. + components: + - type: EncryptionKey + channels: + - ADTWiretapping + defaultChannel: ADTWiretapping + - type: Sprite + layers: + - state: crypt_gray + - state: sec_label + +- type: entity + parent: ClothingHeadset + id: ADTWiretappingClothingHeadset + name: cargo headset + description: A headset used by supply employees. + components: + - type: ContainerFill + containers: + key_slots: + - ADTWiretappingEncryptionKey + - type: Sprite + sprite: Clothing/Ears/Headsets/security.rsi + state: icon_alt + - type: Clothing + sprite: Clothing/Ears/Headsets/security.rsi + +- type: entity + name: handheld radio + description: A handy handheld radio. + parent: BaseItem + id: ADTWiretapping + components: + - type: RadioMicrophone + broadcastChannel: ADTWiretapping + listenRange: 8 + enabled: true + toggleOnInteract: false + - type: Sprite + sprite: ADT/Objects/Misc/wiretapping.rsi + layers: + - state: wiretapping + - type: Item + sprite: ADT/Objects/Misc/wiretapping.rsi + +- type: entity + parent: BaseItem + id: ADTWiretappingToy + name: WiretappingToy + abstract: true + components: + - type: StorageFill + contents: + - id: ADTWiretapping + - type: Storage + maxSlots: 1 + maxItemSize: Normal + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + + +- type: entity + parent: [ PlushieBee, ADTWiretappingToy ] + id: ADTWiretappingPlushieBee + name: bee plushie + description: A cute toy that resembles an even cuter programmer. You'd have to be a monster to grind this up. + +- type: entity + parent: [ PlushieSharkPink, ADTWiretappingToy ] + id: ADTWiretappingPlushieSharkPink + name: pink shark soft toy + description: Hehe shonk :) + +- type: entity + parent: [ PlushieCarp, ADTWiretappingToy ] + id: ADTWiretappingPlushieCarp + name: carp plushie + description: An adorable stuffed toy that resembles the monstrous space carp. + +- type: entity + parent: [ PlushieSlime, ADTWiretappingToy ] + id: ADTWiretappingPlushieSlime + name: slime plushie + description: An adorable stuffed toy that resembles a slime. It's basically a hacky sack. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml new file mode 100644 index 00000000000..d6bd7b255c1 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml @@ -0,0 +1,181 @@ +#PatchPack +- type: entity + name: patch pack + id: ADTPatchPack + parent: BaseStorageItem + description: It's a container for storing medical patches. + components: + - type: Sprite + sprite: ADT/Objects/Specific/Medical/patch.rsi + scale: 1.3, 1.3 + state: patchpack + - type: Item + size: Normal + - type: Storage + maxTotalWeight: 12 + maxItemSize: Small + quickInsert: true + areaInsert: true + whitelist: + tags: + - Patch +#PatchPackFilled +- type: entity + name: patch pack + id: ADTPatchPackFilled + suffix: Filled + parent: ADTPatchPack + components: + - type: StorageFill + contents: + - id: ADTPatchHealing + amount: 1 + - id: ADTPatchBurn + amount: 1 + - id: ADTPatchHealingMini + amount: 2 + - id: ADTPatchBurnMini + amount: 2 +#BasePatch +- type: entity + name: patch + parent: BaseItem + description: + id: ADTBasePatch + components: + - type: Sprite + sprite: ADT/Objects/Specific/Medical/patch.rsi + layers: + - state: patch0 + map: ["enum.SolutionContainerLayers.Fill"] + - type: Item + sprite: ADT/Objects/Specific/Medical/patch.rsi + size: Small + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + - type: DeleteOnSolutionEmpty + solution: pen + - type: Hypospray + solutionName: pen + transferAmount: 20 + - type: Extractable + grindableSolutionName: pen + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: patchused + - type: Tag + tags: + - Patch +#Patch healing +- type: entity + name: healing patch + parent: ADTBasePatch + id: ADTPatchHealing + description: Helps with brute injuries. + components: + - type: Sprite + layers: + - state: patch2 + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: ADTStypticPowder + Quantity: 20 +#Patch healing small +- type: entity + name: healing mini-patch + parent: ADTBasePatch + id: ADTPatchHealingMini + description: Helps with brute injuries. + components: + - type: Sprite + layers: + - state: patch1 + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: ADTStypticPowder + Quantity: 10 +#Patch burn +- type: entity + name: burn patch + parent: ADTBasePatch + id: ADTPatchBurn + description: Helps with burn injuries. + components: + - type: Sprite + layers: + - state: patch4 + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: ADTSilverSulfadiazine + Quantity: 20 +#Patch burn small +- type: entity + name: burn mini-patch. + parent: ADTBasePatch + id: ADTPatchBurnMini + description: Helps with burn injuries. + components: + - type: Sprite + layers: + - state: patch3 + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: ADTSilverSulfadiazine + Quantity: 10 +#honk honk? +- type: entity + name: honk patch + parent: ADTBasePatch + id: ADTPatchHonk + description: Miracle honk-medicine, increases the level of fun in the blood. + components: + - type: Sprite + layers: + - state: patch20 + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerManager + solutions: + pen: + maxVol: 15 + reagents: + - ReagentId: Honk + Quantity: 6 +#patch crate +- type: entity + id: ADTCratePatchPack + parent: CrateMedical + components: + - type: StorageFill + contents: + - id: ADTPatchPackFilled + amount: 4 +#Cargo +- type: cargoProduct + id: ADTCratePatchPack + icon: + sprite: ADT/Objects/Specific/Medical/patch.rsi + state: patchpack + product: ADTCratePatchPack + cost: 1600 + category: Medical + group: market diff --git a/Resources/Textures/ADT/Objects/Misc/wiretapping.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/wiretapping.rsi/meta.json new file mode 100644 index 00000000000..1eabdf879a7 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/wiretapping.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wiretapping" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/wiretapping.rsi/wiretapping.png b/Resources/Textures/ADT/Objects/Misc/wiretapping.rsi/wiretapping.png new file mode 100644 index 0000000000000000000000000000000000000000..15909c7a941dc4b11714be668d18a204cd9203ac GIT binary patch literal 8318 zcmeHMe{2)i9X~f)lR6C~ZOWi*^k&M~fb;#Z9iMM8Zej=G7N;i3vSflS=euX;hV3(V zm)MDhMuBQup@KA&O^BI7VMNdpb?YJqZK12G(J?VfN7TSjNLS|U8u76oY+aW zOr4$ek4b*k`TKr+zn|~-`+48@^#5n-G*KJhtB=9b9m9K&(CrEx%+VE_0rw5U$!+IKlA(64Wa1^gLAI# z>Fxcr>r25z=k?80;=XxntF$uw(*pPUW9#28eYf~mrIBZZhZkKMh)+9}-%mCb4{!U~ zCJfVUkep7h+v!YY19RB1rqf>ihPU*|$LsbQh_7732e<5M`{l-`*li1Dyk03SeEDkg z-%dMPPH)+Bh}9qbV*U?j9GGT2d6+w-U-#bhA0OD*wR_{%*!OB%N-nNHF~lZ*{>GZy zy2>Lb>s4IWy&Z^k?w7nP9?0t{Fl?Z{waoX6_(|gZ3%_~o!wVOOR_+M24-BbKZhhu0 zY-jb3=EHo6T>QuIceu-I1`7^6s=r~ov8STwK8Lch?USd~H~A+5OE&$WEzVXhYWPRv zheCs;esI=c_wMg+B}-Q{u=47L4?KN;?K(;|o^DW9?0ayj{;}%0c_qyD?p@OgSD&@i zE)%bmU%Bv*dS{mM)}{SVbPBqn?k!(-{QaRj@fVxoaiwdWyZQQ?y^gP~J!U*5^?!W( zrBJj68#YDu-n#R28Fky;abRE7=C#+$BCF58bIJaml0S3J>3L4&VaKyxV_qWgk*BKp z(u|qkRWJA1e|IHs%f2RJ0L%Z;BQI3;e=sL8=jzULN27;t4(a0E%Ar?IoP8TsU7G}} ztI@NJ6XcMQ7iAwX#zGNTb{JOfh(&l|70_@W2uNYOA#voW0hdI(;oBAu<%u{!i&WjA zfVz&FdZA;LU=t0F#rpCX2LVDr{AB20W>vt+E>$Jzm@?D*!he z%|?o-ib-vZVX+=BS42No>sm4j0Y`R2i>5_5l8i>9#;D0CD*=+W*=!`mkPJgW4MJ@X zYkZ6dt8)>=2!;!&f+9sUNe<%(llRH3n%!W4>v$@@P{iX&!-v&T79byFjE|7Cks?DO za=eAARkcBo(SRnkQ0w6#C2N5yw<-dtY6D?y?sy1MNZUtRm0&U*Q6NDOgrKSlz0wn0 zE_HjnX$wR_Kng{YR*>uonwsPvBWprzXeF7>_&}g}8h3(rD)*!^)be;Zmn^iR@Z2uD z0r}@dS&&37*|mzS=(Cz=g7pg~!tAH~gik1A35o$0o}sLa=(CN3a)(uo4+{W6L2#o4 zad&;-5I(@Ogv}-b8klW98&#Hs5(RFFtb};Dol=Mo05TE|Bo`3jT!q(dH!wzOY{nbp zH9s_fXFv*za#S5#s+U5bPU8`uw3TAaEX`P1ri`Z9arO;BQDH42RGKoH%t>>!F&s<> zQp=-Cg#gKUm<{Jt0I$hPy(|aq1{4&IEYr&#c%VdH<6XQ4ASlI{IGW*TQ$5XcjFq#P z7E&gT8mBLdlE3}4w9)aw%SSf7T2i6^_T<#anW_V;M@A#Vpp-mJIG#Kf950Ndpz>`% zOvVYZMwWyYJ{$n>{unLT)VwrFG5Bd~nFW~22*K=!JIKRgu$dVfVYM<=(ZaJ|B&*;*Ry-a~H`~?(+uS$Jj#WDDrb+_-ar7mn3eV%)DUl*LYCsN&{Vp!q*=+R-@ zcg%#7`I_5Pm4Er(qUp1_tsET4Nhjj~QsCDE2bX;}x5a*pIwTE-U<%d*3hRXo~? z Date: Wed, 13 Dec 2023 19:39:23 +0300 Subject: [PATCH 2/8] Update wiretapping.ftl --- Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl b/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl index 545aeb468f3..43577e8fd13 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl @@ -4,7 +4,7 @@ ent-ADTWiretappingClothingHeadset = гарнитура прослушивающ ent-ADTWiretappingEncryptionKey = ключ шифрования прослушивающего устройства .suffix = Ивент - .desc = + .desc = Ключ шифрования прослушивающего устройства. ent-ADTWiretapping = прослушивающее устройство .suffix = Ивент From 8bc3fc62fb0970fc466141a9d40bce26c642ac9e Mon Sep 17 00:00:00 2001 From: Schrodinger71 <132720404+Schrodinger71@users.noreply.github.com> Date: Wed, 13 Dec 2023 20:27:44 +0300 Subject: [PATCH 3/8] Update wiretapping.yml --- Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml index 8ddc5d91fcb..d638ea68c89 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml @@ -61,12 +61,13 @@ name: WiretappingToy abstract: true components: + - type: Matchbox - type: StorageFill contents: - id: ADTWiretapping - type: Storage maxSlots: 1 - maxItemSize: Normal + maxItemSize: Small - type: ContainerContainer containers: storagebase: !type:Container From 2317ecb7923597cf31f164478aa33912c39afb49 Mon Sep 17 00:00:00 2001 From: Xelasto <86181060+Xelasto@users.noreply.github.com> Date: Wed, 13 Dec 2023 20:48:01 +0300 Subject: [PATCH 4/8] Update wiretapping.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Моя попытка исправить ошибку в билд-тесте --- .../Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml index d638ea68c89..b0185c9a6d5 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml @@ -46,8 +46,8 @@ - type: RadioMicrophone broadcastChannel: ADTWiretapping listenRange: 8 - enabled: true - toggleOnInteract: false + enabled: false + toggleOnInteract: true - type: Sprite sprite: ADT/Objects/Misc/wiretapping.rsi layers: From 3f00e0e5471a78cb3bad68aa13219ce6e36c2dbc Mon Sep 17 00:00:00 2001 From: Lonkuk Date: Fri, 16 Aug 2024 01:46:10 +0300 Subject: [PATCH 5/8] commentAll patch.yml --- .../Objects/Specific/Medical/patch.yml | 365 +++++++++--------- 1 file changed, 184 insertions(+), 181 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml index d6bd7b255c1..10aa85a258d 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/patch.yml @@ -1,181 +1,184 @@ -#PatchPack -- type: entity - name: patch pack - id: ADTPatchPack - parent: BaseStorageItem - description: It's a container for storing medical patches. - components: - - type: Sprite - sprite: ADT/Objects/Specific/Medical/patch.rsi - scale: 1.3, 1.3 - state: patchpack - - type: Item - size: Normal - - type: Storage - maxTotalWeight: 12 - maxItemSize: Small - quickInsert: true - areaInsert: true - whitelist: - tags: - - Patch -#PatchPackFilled -- type: entity - name: patch pack - id: ADTPatchPackFilled - suffix: Filled - parent: ADTPatchPack - components: - - type: StorageFill - contents: - - id: ADTPatchHealing - amount: 1 - - id: ADTPatchBurn - amount: 1 - - id: ADTPatchHealingMini - amount: 2 - - id: ADTPatchBurnMini - amount: 2 -#BasePatch -- type: entity - name: patch - parent: BaseItem - description: - id: ADTBasePatch - components: - - type: Sprite - sprite: ADT/Objects/Specific/Medical/patch.rsi - layers: - - state: patch0 - map: ["enum.SolutionContainerLayers.Fill"] - - type: Item - sprite: ADT/Objects/Specific/Medical/patch.rsi - size: Small - - type: SolutionContainerManager - solutions: - pen: - maxVol: 20 - - type: DeleteOnSolutionEmpty - solution: pen - - type: Hypospray - solutionName: pen - transferAmount: 20 - - type: Extractable - grindableSolutionName: pen - - type: Appearance - - type: SolutionContainerVisuals - maxFillLevels: 1 - changeColor: false - emptySpriteName: patchused - - type: Tag - tags: - - Patch -#Patch healing -- type: entity - name: healing patch - parent: ADTBasePatch - id: ADTPatchHealing - description: Helps with brute injuries. - components: - - type: Sprite - layers: - - state: patch2 - map: ["enum.SolutionContainerLayers.Fill"] - - type: SolutionContainerManager - solutions: - pen: - maxVol: 20 - reagents: - - ReagentId: ADTStypticPowder - Quantity: 20 -#Patch healing small -- type: entity - name: healing mini-patch - parent: ADTBasePatch - id: ADTPatchHealingMini - description: Helps with brute injuries. - components: - - type: Sprite - layers: - - state: patch1 - map: ["enum.SolutionContainerLayers.Fill"] - - type: SolutionContainerManager - solutions: - pen: - maxVol: 20 - reagents: - - ReagentId: ADTStypticPowder - Quantity: 10 -#Patch burn -- type: entity - name: burn patch - parent: ADTBasePatch - id: ADTPatchBurn - description: Helps with burn injuries. - components: - - type: Sprite - layers: - - state: patch4 - map: ["enum.SolutionContainerLayers.Fill"] - - type: SolutionContainerManager - solutions: - pen: - maxVol: 20 - reagents: - - ReagentId: ADTSilverSulfadiazine - Quantity: 20 -#Patch burn small -- type: entity - name: burn mini-patch. - parent: ADTBasePatch - id: ADTPatchBurnMini - description: Helps with burn injuries. - components: - - type: Sprite - layers: - - state: patch3 - map: ["enum.SolutionContainerLayers.Fill"] - - type: SolutionContainerManager - solutions: - pen: - maxVol: 20 - reagents: - - ReagentId: ADTSilverSulfadiazine - Quantity: 10 -#honk honk? -- type: entity - name: honk patch - parent: ADTBasePatch - id: ADTPatchHonk - description: Miracle honk-medicine, increases the level of fun in the blood. - components: - - type: Sprite - layers: - - state: patch20 - map: ["enum.SolutionContainerLayers.Fill"] - - type: SolutionContainerManager - solutions: - pen: - maxVol: 15 - reagents: - - ReagentId: Honk - Quantity: 6 -#patch crate -- type: entity - id: ADTCratePatchPack - parent: CrateMedical - components: - - type: StorageFill - contents: - - id: ADTPatchPackFilled - amount: 4 -#Cargo -- type: cargoProduct - id: ADTCratePatchPack - icon: - sprite: ADT/Objects/Specific/Medical/patch.rsi - state: patchpack - product: ADTCratePatchPack - cost: 1600 - category: Medical - group: market +# ||| Uncomment in medical update +# vvv +##PatchPack +#- type: entity +# name: patch pack +# id: ADTPatchPack +# parent: BaseStorageItem +# description: It's a container for storing medical patches. +# components: +# - type: Sprite +# sprite: ADT/Objects/Specific/Medical/patch.rsi +# scale: 1.3, 1.3 +# state: patchpack +# - type: Item +# size: Normal +# - type: Storage +# maxTotalWeight: 12 +# maxItemSize: Small +# quickInsert: true +# areaInsert: true +# whitelist: +# tags: +# - Patch +##PatchPackFilled +#- type: entity +# name: patch pack +# id: ADTPatchPackFilled +# suffix: Filled +# parent: ADTPatchPack +# components: +# - type: StorageFill +# contents: +# - id: ADTPatchHealing +# amount: 1 +# - id: ADTPatchBurn +# amount: 1 +# - id: ADTPatchHealingMini +# amount: 2 +# - id: ADTPatchBurnMini +# amount: 2 +##BasePatch +#- type: entity +# name: patch +# parent: BaseItem +# description: +# id: ADTBasePatch +# components: +# - type: Sprite +# sprite: ADT/Objects/Specific/Medical/patch.rsi +# layers: +# - state: patch0 +# map: ["enum.SolutionContainerLayers.Fill"] +# - type: Item +# sprite: ADT/Objects/Specific/Medical/patch.rsi +# size: Small +# - type: SolutionContainerManager +# solutions: +# pen: +# maxVol: 20 +# - type: DeleteOnSolutionEmpty +# solution: pen +# - type: Hypospray +# solutionName: pen +# transferAmount: 20 +# - type: Extractable +# grindableSolutionName: pen +# - type: Appearance +# - type: SolutionContainerVisuals +# maxFillLevels: 1 +# changeColor: false +# emptySpriteName: patchused +# - type: Tag +# tags: +# - Patch +##Patch healing +#- type: entity +# name: healing patch +# parent: ADTBasePatch +# id: ADTPatchHealing +# description: Helps with brute injuries. +# components: +# - type: Sprite +# layers: +# - state: patch2 +# map: ["enum.SolutionContainerLayers.Fill"] +# - type: SolutionContainerManager +# solutions: +# pen: +# maxVol: 20 +# reagents: +# - ReagentId: ADTStypticPowder +# Quantity: 20 +##Patch healing small +#- type: entity +# name: healing mini-patch +# parent: ADTBasePatch +# id: ADTPatchHealingMini +# description: Helps with brute injuries. +# components: +# - type: Sprite +# layers: +# - state: patch1 +# map: ["enum.SolutionContainerLayers.Fill"] +# - type: SolutionContainerManager +# solutions: +# pen: +# maxVol: 20 +# reagents: +# - ReagentId: ADTStypticPowder +# Quantity: 10 +##Patch burn +#- type: entity +# name: burn patch +# parent: ADTBasePatch +# id: ADTPatchBurn +# description: Helps with burn injuries. +# components: +# - type: Sprite +# layers: +# - state: patch4 +# map: ["enum.SolutionContainerLayers.Fill"] +# - type: SolutionContainerManager +# solutions: +# pen: +# maxVol: 20 +# reagents: +# - ReagentId: ADTSilverSulfadiazine +# Quantity: 20 +##Patch burn small +#- type: entity +# name: burn mini-patch. +# parent: ADTBasePatch +# id: ADTPatchBurnMini +# description: Helps with burn injuries. +# components: +# - type: Sprite +# layers: +# - state: patch3 +# map: ["enum.SolutionContainerLayers.Fill"] +# - type: SolutionContainerManager +# solutions: +# pen: +# maxVol: 20 +# reagents: +# - ReagentId: ADTSilverSulfadiazine +# Quantity: 10 +##honk honk? +#- type: entity +# name: honk patch +# parent: ADTBasePatch +# id: ADTPatchHonk +# description: Miracle honk-medicine, increases the level of fun in the blood. +# components: +# - type: Sprite +# layers: +# - state: patch20 +# map: ["enum.SolutionContainerLayers.Fill"] +# - type: SolutionContainerManager +# solutions: +# pen: +# maxVol: 15 +# reagents: +# - ReagentId: Honk +# Quantity: 6 +##patch crate +#- type: entity +# id: ADTCratePatchPack +# parent: CrateMedical +# components: +# - type: StorageFill +# contents: +# - id: ADTPatchPackFilled +# amount: 4 +##Cargo +#- type: cargoProduct +# id: ADTCratePatchPack +# icon: +# sprite: ADT/Objects/Specific/Medical/patch.rsi +# state: patchpack +# product: ADTCratePatchPack +# cost: 1600 +# category: Medical +# group: market +# \ No newline at end of file From 58a522337f3bc86f7d87f503c6c9e5c0cc936502 Mon Sep 17 00:00:00 2001 From: Lonkuk Date: Fri, 16 Aug 2024 01:50:40 +0300 Subject: [PATCH 6/8] fix locale path --- .../ADT/{ => prototypes/Entities}/Objects/Misc/wiretapping.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/ADT/{ => prototypes/Entities}/Objects/Misc/wiretapping.ftl (100%) diff --git a/Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/wiretapping.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Objects/Misc/wiretapping.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/wiretapping.ftl From be6e34e3bcba87564bc398a5d329ee473d0edd35 Mon Sep 17 00:00:00 2001 From: Lonkuk Date: Fri, 16 Aug 2024 01:58:51 +0300 Subject: [PATCH 7/8] fix wiretapping.yml --- .../Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml index b0185c9a6d5..e53008ba84e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml @@ -74,8 +74,8 @@ ents: [] - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface - type: entity From f12b8ab62bd47f65488a4b852f3643120e18050e Mon Sep 17 00:00:00 2001 From: Lonkuk Date: Fri, 16 Aug 2024 02:30:17 +0300 Subject: [PATCH 8/8] fix wiretapping.yml 2 --- Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml index e53008ba84e..47d8aa25171 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/wiretapping.yml @@ -66,8 +66,9 @@ contents: - id: ADTWiretapping - type: Storage - maxSlots: 1 maxItemSize: Small + grid: + - 1,0,2,0 - type: ContainerContainer containers: storagebase: !type:Container