From 4167d5186a7b2ee1089f6976ddad53690af380ad Mon Sep 17 00:00:00 2001 From: EvilBug Date: Sat, 4 May 2024 09:41:08 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/{Evil => Evil Prototype's}/HumanGopBand.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/Andromeda/{Evil => Evil Prototype's}/HumanGopBand.yml (100%) diff --git a/Resources/Prototypes/Andromeda/Evil/HumanGopBand.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/HumanGopBand.yml similarity index 100% rename from Resources/Prototypes/Andromeda/Evil/HumanGopBand.yml rename to Resources/Prototypes/Andromeda/Evil Prototype's/HumanGopBand.yml From 970d3717b3715cc1896b2ea8bd348930efd8776c Mon Sep 17 00:00:00 2001 From: EvilBug Date: Sat, 4 May 2024 16:31:24 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B5=D1=82=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=20"=D0=B0=D1=84=D1=80=D0=BE=D0=B4=D0=BE=D0=B7=D0=B8?= =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/Evil Prototype's/funnipills.yml | 29 +++++++++++++++++++ .../Prototypes/Catalog/Fills/Lockers/misc.yml | 13 +++++++++ 2 files changed, 42 insertions(+) create mode 100644 Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml new file mode 100644 index 00000000000..07a25e3c754 --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml @@ -0,0 +1,29 @@ +- type: entity + name: Афродизиак + parent: Pill + id: FunniPill + suffix: Андромеда + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + reagents: + - ReagentId: Potassium + Quantity: 10 + - ReagentId: Vinegar + Quantity: 10 + +- type: entity + name: подозрительная таблеточница + description: Подозрительная таблеточница, с не менее подозрительными таблетками... + parent: PillCanister + id: FunniPillCanister + suffix: Андромеда, Заполненный + components: + - type: StorageFill + contents: + - id: FunniPill + prob: 1 + maxAmount: 10 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 517beafa088..9617973fa8b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -87,6 +87,7 @@ - id: OxygenTankFilled - id: FireExtinguisher prob: 0.25 + - type: entity id: ClosetMaintenanceFilledRandom suffix: Filled, Random @@ -159,6 +160,12 @@ prob: 0.20 - id: BarberScissors prob: 0.05 +# A-13 FunniPills start + - id: FunniPill + prob: 0.2 + - id: FunniPillCanister + prob: 0.1 +# A-13 FunniPills end # Syndicate loot - id: null prob: 0.95 @@ -259,6 +266,12 @@ prob: 0.20 - id: ModularReceiver prob: 0.1 +# A-13 FunniPills start + - id: FunniPill + prob: 0.2 + - id: FunniPillCanister + prob: 0.1 +# A-13 FunniPills end # Syndicate loot - id: null prob: 0.95 From d8667b41c6262136031f5b2faad2d0690f0b9ed2 Mon Sep 17 00:00:00 2001 From: EvilBug Date: Sun, 5 May 2024 19:41:28 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=2010=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B8=20=D0=B4=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=80=D0=B0=D0=BD=D0=B4=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/Evil Prototype's/funnipills.yml | 228 +++++++++++++++++- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 8 +- 2 files changed, 225 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml index 07a25e3c754..43765cdef5e 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml @@ -1,7 +1,8 @@ -- type: entity +- type: entity # Таблетка "Горячая бума" name: Афродизиак + description: Повышает потенцию как никто другой! Скушайте! parent: Pill - id: FunniPill + id: FunniPill1 suffix: Андромеда components: - type: SolutionContainerManager @@ -9,12 +10,199 @@ food: maxVol: 20 canBoil: false + canReact: false reagents: - ReagentId: Potassium Quantity: 10 - ReagentId: Vinegar Quantity: 10 +- type: entity # Таблетка "Горячие пчелки" + parent: FunniPill1 + id: FunniPill2 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + canBoil: false + canReact: false + reagents: + - ReagentId: BuzzochloricBees + Quantity: 5 + - ReagentId: CapsaicinOil + Quantity: 5 + - ReagentId: Frostoil + Quantity: 5 + +- type: entity # Таблетка "Взрывной желудок" + parent: FunniPill1 + id: FunniPill3 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + canReact: false + reagents: + - ReagentId: Ipecac + Quantity: 10 + - ReagentId: Water + Quantity: 5 + - ReagentId: Potassium + Quantity: 5 + +- type: entity # Таблетка "Взрывная свежесть" + parent: FunniPill1 + id: FunniPill4 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + canReact: false + reagents: + - ReagentId: Water + Quantity: 5 + - ReagentId: Potassium + Quantity: 5 + +- type: entity # Таблетка "Ежик в тумане" + parent: FunniPill1 + id: FunniPill5 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + canReact: false + reagents: + - ReagentId: Sugar + Quantity: 1 + - ReagentId: Potassium + Quantity: 1 + - ReagentId: Phosphorus + Quantity: 1 + - ReagentId: SpaceDrugs + Quantity: 17 + +- type: entity # Таблетка "Горячая Диона" (Очень сильная бума... не убьет, но урон будет) + parent: FunniPill1 + id: FunniPill6 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + canBoil: false + canReact: false + reagents: + - ReagentId: SulfuricAcid + Quantity: 1 + - ReagentId: Plasma + Quantity: 1 + - ReagentId: Phosphorus + Quantity: 1 + - ReagentId: Fluorine + Quantity: 3 + - ReagentId: Chlorine + Quantity: 1 + +- type: entity # Таблетка "Ежик в пене" + parent: FunniPill1 + id: FunniPill7 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + canReact: false + reagents: + - ReagentId: SulfuricAcid + Quantity: 1 + - ReagentId: Fluorine + Quantity: 2 + - ReagentId: Carbon + Quantity: 2 + - ReagentId: Water + Quantity: 5 + - ReagentId: SpaceDrugs + Quantity: 10 + +- type: entity # Таблетка "Охлаждающая свежесть" + parent: FunniPill1 + id: FunniPill8 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + canReact: false + reagents: + - ReagentId: Fresium + Quantity: 10 + - ReagentId: MuteToxin + Quantity: 10 + +- type: entity # Таблетка "шокиум". Электризующе! Попробуйте! + parent: FunniPill1 + id: FunniPill9 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + canReact: false + reagents: + - ReagentId: Tazinide + Quantity: 10 + - ReagentId: Licoxide + Quantity: 10 + +- type: entity # Тяжелая наркота "Унатх Гена" (запрещена к обороту, асуждаем) + parent: FunniPill1 + id: FunniPill10 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + canBoil: false + canReact: false + reagents: + - ReagentId: MindbreakerToxin + Quantity: 5 + - ReagentId: THC + Quantity: 5 + - ReagentId: Ethanol + Quantity: 5 + - ReagentId: Laughter + Quantity: 5 + +- type: entity # Таблетка "Походный ковер" + parent: FunniPill1 + id: FunniPill11 + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + canBoil: false + canReact: false + reagents: + - ReagentId: Fluorosurfactant + Quantity: 5 + - ReagentId: Water + Quantity: 5 + - ReagentId: Carpetium + Quantity: 5 + - type: entity name: подозрительная таблеточница description: Подозрительная таблеточница, с не менее подозрительными таблетками... @@ -24,6 +212,36 @@ components: - type: StorageFill contents: - - id: FunniPill - prob: 1 - maxAmount: 10 \ No newline at end of file + - id: FunniPill1 + prob: 0.15 + maxAmount: 5 + - id: FunniPill2 + prob: 0.15 + maxAmount: 5 + - id: FunniPill3 + prob: 0.15 + maxAmount: 5 + - id: FunniPill4 + prob: 0.15 + maxAmount: 5 + - id: FunniPill5 + prob: 0.15 + maxAmount: 5 + - id: FunniPill6 + prob: 0.15 + maxAmount: 5 + - id: FunniPill7 + prob: 0.15 + maxAmount: 5 + - id: FunniPill8 + prob: 0.15 + maxAmount: 5 + - id: FunniPill9 + prob: 0.15 + maxAmount: 5 + - id: FunniPill10 + prob: 0.15 + maxAmount: 5 + - id: FunniPill11 + prob: 0.15 + maxAmount: 5 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 9617973fa8b..985739e8e22 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -161,10 +161,8 @@ - id: BarberScissors prob: 0.05 # A-13 FunniPills start - - id: FunniPill - prob: 0.2 - id: FunniPillCanister - prob: 0.1 + prob: 0.15 # A-13 FunniPills end # Syndicate loot - id: null @@ -267,10 +265,8 @@ - id: ModularReceiver prob: 0.1 # A-13 FunniPills start - - id: FunniPill - prob: 0.2 - id: FunniPillCanister - prob: 0.1 + prob: 0.15 # A-13 FunniPills end # Syndicate loot - id: null From 68245277c07cd446b4c1e65724d9563f53bca425 Mon Sep 17 00:00:00 2001 From: EvilBug Date: Mon, 6 May 2024 20:17:50 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B8?= =?UTF-8?q?=20=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B4=D0=BE=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/Evil Prototype's/funnipills.yml | 92 ++++++++++--------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml index 43765cdef5e..a295d7859c6 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml @@ -1,8 +1,8 @@ -- type: entity # Таблетка "Горячая бума" - name: Афродизиак +- type: entity + name: афродизиак description: Повышает потенцию как никто другой! Скушайте! parent: Pill - id: FunniPill1 + id: FunniPill1 # Горячая бума (просто продолжительный бум) suffix: Андромеда components: - type: SolutionContainerManager @@ -17,9 +17,9 @@ - ReagentId: Vinegar Quantity: 10 -- type: entity # Таблетка "Горячие пчелки" +- type: entity parent: FunniPill1 - id: FunniPill2 + id: FunniPill2 # Горячие пчелки (Ммм, эти жала такие горячие...) (пчелки + острые ощущения) components: - type: SolutionContainerManager solutions: @@ -35,9 +35,9 @@ - ReagentId: Frostoil Quantity: 5 -- type: entity # Таблетка "Взрывной желудок" +- type: entity parent: FunniPill1 - id: FunniPill3 + id: FunniPill3 # Блевучая бука (ипекак + мини взрыв) components: - type: SolutionContainerManager solutions: @@ -53,9 +53,9 @@ - ReagentId: Potassium Quantity: 5 -- type: entity # Таблетка "Взрывная свежесть" +- type: entity parent: FunniPill1 - id: FunniPill4 + id: FunniPill4 # Взрывная свежесть (взрыв + нееемножечко льда) components: - type: SolutionContainerManager solutions: @@ -68,10 +68,12 @@ Quantity: 5 - ReagentId: Potassium Quantity: 5 + - ReagentId: Ice + Quantity: 10 -- type: entity # Таблетка "Ежик в тумане" +- type: entity parent: FunniPill1 - id: FunniPill5 + id: FunniPill5 # Ежик в тумане (Дымок + немного драгов (асуждаем)) components: - type: SolutionContainerManager solutions: @@ -89,9 +91,9 @@ - ReagentId: SpaceDrugs Quantity: 17 -- type: entity # Таблетка "Горячая Диона" (Очень сильная бума... не убьет, но урон будет) +- type: entity parent: FunniPill1 - id: FunniPill6 + id: FunniPill6 # Горячая Диона (Очень сильная бума... не убьет, но урон будет) components: - type: SolutionContainerManager solutions: @@ -111,9 +113,9 @@ - ReagentId: Chlorine Quantity: 1 -- type: entity # Таблетка "Ежик в пене" +- type: entity parent: FunniPill1 - id: FunniPill7 + id: FunniPill7 # Пенный ежик (наркота и пенка) components: - type: SolutionContainerManager solutions: @@ -133,9 +135,9 @@ - ReagentId: SpaceDrugs Quantity: 10 -- type: entity # Таблетка "Охлаждающая свежесть" +- type: entity parent: FunniPill1 - id: FunniPill8 + id: FunniPill8 # Охлаждающая свежесть components: - type: SolutionContainerManager solutions: @@ -149,9 +151,9 @@ - ReagentId: MuteToxin Quantity: 10 -- type: entity # Таблетка "шокиум". Электризующе! Попробуйте! +- type: entity parent: FunniPill1 - id: FunniPill9 + id: FunniPill9 # Шокиум (Электризующе! Попробуйте!) components: - type: SolutionContainerManager solutions: @@ -165,9 +167,9 @@ - ReagentId: Licoxide Quantity: 10 -- type: entity # Тяжелая наркота "Унатх Гена" (запрещена к обороту, асуждаем) +- type: entity parent: FunniPill1 - id: FunniPill10 + id: FunniPill10 # Унатх Гена (запрещена к обороту, асуждаем) components: - type: SolutionContainerManager solutions: @@ -185,9 +187,9 @@ - ReagentId: Laughter Quantity: 5 -- type: entity # Таблетка "Походный ковер" +- type: entity parent: FunniPill1 - id: FunniPill11 + id: FunniPill11 # Походный ковер components: - type: SolutionContainerManager solutions: @@ -213,35 +215,35 @@ - type: StorageFill contents: - id: FunniPill1 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill2 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill3 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill4 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill5 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill6 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill7 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill8 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill9 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill10 - prob: 0.15 - maxAmount: 5 + prob: 0.25 + maxAmount: 3 - id: FunniPill11 - prob: 0.15 - maxAmount: 5 \ No newline at end of file + prob: 0.25 + maxAmount: 3 \ No newline at end of file From ab1c4d1caf4f1794ed4244d18e3ec735fd45ed7b Mon Sep 17 00:00:00 2001 From: EvilBug Date: Mon, 6 May 2024 22:38:50 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BD=D0=BE=D1=83=D1=81=D0=BF=D0=B0=D0=B2=D0=BD=20=D0=B8=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BE=D1=8F=D1=82=D0=BD=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D1=81=D0=BF=D0=B0=D0=B2=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Andromeda/Evil Prototype's/funnipills.yml | 34 ++++++++----- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 48 ++++++++++++++++++- 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml index a295d7859c6..90fe5e7ac8d 100644 --- a/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml +++ b/Resources/Prototypes/Andromeda/Evil Prototype's/funnipills.yml @@ -1,8 +1,9 @@ - type: entity + noSpawn: true name: афродизиак description: Повышает потенцию как никто другой! Скушайте! parent: Pill - id: FunniPill1 # Горячая бума (просто продолжительный бум) + id: FunniPill1 suffix: Андромеда components: - type: SolutionContainerManager @@ -18,8 +19,9 @@ Quantity: 10 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill2 # Горячие пчелки (Ммм, эти жала такие горячие...) (пчелки + острые ощущения) + id: FunniPill2 components: - type: SolutionContainerManager solutions: @@ -36,8 +38,9 @@ Quantity: 5 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill3 # Блевучая бука (ипекак + мини взрыв) + id: FunniPill3 components: - type: SolutionContainerManager solutions: @@ -54,8 +57,9 @@ Quantity: 5 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill4 # Взрывная свежесть (взрыв + нееемножечко льда) + id: FunniPill4 components: - type: SolutionContainerManager solutions: @@ -72,8 +76,9 @@ Quantity: 10 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill5 # Ежик в тумане (Дымок + немного драгов (асуждаем)) + id: FunniPill5 components: - type: SolutionContainerManager solutions: @@ -92,8 +97,9 @@ Quantity: 17 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill6 # Горячая Диона (Очень сильная бума... не убьет, но урон будет) + id: FunniPill6 components: - type: SolutionContainerManager solutions: @@ -114,8 +120,9 @@ Quantity: 1 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill7 # Пенный ежик (наркота и пенка) + id: FunniPill7 components: - type: SolutionContainerManager solutions: @@ -136,8 +143,9 @@ Quantity: 10 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill8 # Охлаждающая свежесть + id: FunniPill8 components: - type: SolutionContainerManager solutions: @@ -152,8 +160,9 @@ Quantity: 10 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill9 # Шокиум (Электризующе! Попробуйте!) + id: FunniPill9 components: - type: SolutionContainerManager solutions: @@ -168,8 +177,9 @@ Quantity: 10 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill10 # Унатх Гена (запрещена к обороту, асуждаем) + id: FunniPill10 components: - type: SolutionContainerManager solutions: @@ -188,8 +198,9 @@ Quantity: 5 - type: entity + noSpawn: true parent: FunniPill1 - id: FunniPill11 # Походный ковер + id: FunniPill11 components: - type: SolutionContainerManager solutions: @@ -206,6 +217,7 @@ Quantity: 5 - type: entity + noSpawn: true name: подозрительная таблеточница description: Подозрительная таблеточница, с не менее подозрительными таблетками... parent: PillCanister diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 985739e8e22..b534e79007b 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -162,7 +162,29 @@ prob: 0.05 # A-13 FunniPills start - id: FunniPillCanister - prob: 0.15 + prob: 0.05 + - id: FunniPill1 + prob: 0.05 + - id: FunniPill2 + prob: 0.05 + - id: FunniPill3 + prob: 0.05 + - id: FunniPill4 + prob: 0.05 + - id: FunniPill5 + prob: 0.05 + - id: FunniPill6 + prob: 0.05 + - id: FunniPill7 + prob: 0.05 + - id: FunniPill8 + prob: 0.05 + - id: FunniPill9 + prob: 0.05 + - id: FunniPill10 + prob: 0.05 + - id: FunniPill11 + prob: 0.05 # A-13 FunniPills end # Syndicate loot - id: null @@ -266,7 +288,29 @@ prob: 0.1 # A-13 FunniPills start - id: FunniPillCanister - prob: 0.15 + prob: 0.05 + - id: FunniPill1 + prob: 0.05 + - id: FunniPill2 + prob: 0.05 + - id: FunniPill3 + prob: 0.05 + - id: FunniPill4 + prob: 0.05 + - id: FunniPill5 + prob: 0.05 + - id: FunniPill6 + prob: 0.05 + - id: FunniPill7 + prob: 0.05 + - id: FunniPill8 + prob: 0.05 + - id: FunniPill9 + prob: 0.05 + - id: FunniPill10 + prob: 0.05 + - id: FunniPill11 + prob: 0.05 # A-13 FunniPills end # Syndicate loot - id: null From 4f28ec4bf641b90c9adaf1df114c77365195f866 Mon Sep 17 00:00:00 2001 From: Lemird Date: Mon, 6 May 2024 23:06:10 +0300 Subject: [PATCH 6/6] fix tag A-13 --- Resources/Prototypes/Catalog/Fills/Lockers/misc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index b534e79007b..3aebb281140 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -160,7 +160,7 @@ prob: 0.20 - id: BarberScissors prob: 0.05 -# A-13 FunniPills start + # A-13 FunniPills start - id: FunniPillCanister prob: 0.05 - id: FunniPill1 @@ -185,7 +185,7 @@ prob: 0.05 - id: FunniPill11 prob: 0.05 -# A-13 FunniPills end + # A-13 FunniPills end # Syndicate loot - id: null prob: 0.95