From a419b0c2f2bc41fa119fd4e7e80009c1cb971005 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Fri, 11 Oct 2024 06:54:12 +0300 Subject: [PATCH 1/6] =?UTF-8?q?[Tweak]=20Dwarf's=20Weight=20/=20=D0=92?= =?UTF-8?q?=D0=B5=D1=81=20=D0=94=D0=B2=D0=B0=D1=80=D1=84=D0=BE=D0=B2=20(#8?= =?UTF-8?q?3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: dwarf are heavier now --- Resources/Prototypes/Entities/Mobs/Species/dwarf.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 1de9f89ce8..a48809f1a7 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -35,8 +35,7 @@ shape: !type:PhysShapeCircle radius: 0.35 - # they r smaller - density: 120 + density: 240 # WD EDIT restitution: 0.0 mask: - MobMask From 71db6a2ca159f590344deb87c2697b1cba17c974 Mon Sep 17 00:00:00 2001 From: WWDP Changelogs Date: Fri, 11 Oct 2024 03:54:39 +0000 Subject: [PATCH 2/6] Automatic Changelog Update (#83) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 08e58360fa..9f939d84fb 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -6502,3 +6502,10 @@ Entries: id: 6360 time: '2024-09-29T12:15:14.0000000+00:00' url: https://github.com/WWhiteDreamProject/wwdpublic/pull/68 +- author: Spatison + changes: + - type: Tweak + message: Dwarf now weigh more / Дварфы теперь весят больше + id: 6361 + time: '2024-10-11T03:54:12.0000000+00:00' + url: https://github.com/WWhiteDreamProject/wwdpublic/pull/83 From d3be10ea18c6202bfdc0ae56f243f548dec5ac91 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Fri, 11 Oct 2024 06:55:38 +0300 Subject: [PATCH 3/6] =?UTF-8?q?[Fix]=20No=20Discounts=20In=20Uplink=20Impl?= =?UTF-8?q?ant=20/=20=D0=9D=D0=B8=D0=BA=D0=B0=D0=BA=D0=B8=D1=85=20=D0=A1?= =?UTF-8?q?=D0=BA=D0=B8=D0=B4=D0=BE=D0=BA=20=D0=92=20=D0=98=D0=BC=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D0=BD=D1=82=D0=B5=20=D0=90=D0=BF=D0=BB=D0=B8=D0=BD?= =?UTF-8?q?=D0=BA=D0=B0=20(#81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: uplink-implant --- .../Objects/Misc/subdermal_implants.yml | 2 +- Resources/Prototypes/_White/Store/presets.yml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_White/Store/presets.yml diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 2336945f17..8434bf6484 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -155,7 +155,7 @@ components: - Hands # prevent mouse buying grenade penguin since its not telepathic - type: Store - preset: StorePresetUplink + preset: StorePresetUplinkNoDiscounts balance: Telecrystal: 0 - type: UserInterface diff --git a/Resources/Prototypes/_White/Store/presets.yml b/Resources/Prototypes/_White/Store/presets.yml new file mode 100644 index 0000000000..52f51076f9 --- /dev/null +++ b/Resources/Prototypes/_White/Store/presets.yml @@ -0,0 +1,17 @@ +- type: storePreset + id: StorePresetUplinkNoDiscounts + storeName: Uplink + categories: + - UplinkWeapons + - UplinkAmmo + - UplinkExplosives + - UplinkMisc + - UplinkBundles + - UplinkTools + - UplinkUtility + - UplinkImplants + - UplinkJob + - UplinkArmor + - UplinkPointless + currencyWhitelist: + - Telecrystal From dc5ff89a5b9d4f81d1211398f39ad3c9bab4481e Mon Sep 17 00:00:00 2001 From: WWDP Changelogs Date: Fri, 11 Oct 2024 03:56:04 +0000 Subject: [PATCH 4/6] Automatic Changelog Update (#81) --- Resources/Changelog/Changelog.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9f939d84fb..b02e9ac261 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -6509,3 +6509,12 @@ Entries: id: 6361 time: '2024-10-11T03:54:12.0000000+00:00' url: https://github.com/WWhiteDreamProject/wwdpublic/pull/83 +- author: Spatison + changes: + - type: Fix + message: >- + No more discounts in uplink implant / Больше никаких скидок в имплант + аплинка + id: 6362 + time: '2024-10-11T03:55:38.0000000+00:00' + url: https://github.com/WWhiteDreamProject/wwdpublic/pull/81 From 91a2f2a384194e636e959e43dcd65b200c23b491 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:07:40 +0300 Subject: [PATCH 5/6] =?UTF-8?q?[Port]=20Smoke=20Implant=20/=20=D0=98=D0=BC?= =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=BD=D1=82=20=D0=94=D1=8B=D0=BC=D0=B0=20(#7?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add: smoke implant --- .../Locale/en-US/_white/store/uplink-catalog.ftl | 3 +++ .../ru-RU/_white/prototypes/actions/types.ftl | 2 ++ .../entities/objects/misc/implanters.ftl | 2 ++ .../entities/objects/misc/subdermal_implants.ftl | 2 ++ .../Locale/ru-RU/_white/store/uplink-catalog.ftl | 3 +++ Resources/Prototypes/_White/Actions/types.yml | 14 ++++++++++++++ .../Prototypes/_White/Catalog/uplink_catalog.yml | 13 ++++++++++++- .../_White/Entities/Objects/Misc/implanters.yml | 7 +++++++ .../Entities/Objects/Misc/subdermal_implants.yml | 15 +++++++++++++++ 9 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/ru-RU/_white/prototypes/actions/types.ftl create mode 100644 Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl create mode 100644 Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl create mode 100644 Resources/Prototypes/_White/Actions/types.yml create mode 100644 Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml create mode 100644 Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl index f80d022535..812ec6ac29 100644 --- a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl @@ -9,3 +9,6 @@ uplink-betrayal-knife-desc = Syndicate teleporter, when used, moves 3-8 meters f uplink-ebow-name = Small energy crossbow uplink-ebow-desc = A fairly quiet weapon that automatically reloads and stuns. It goes well with other types of weapons. + +uplink-smoke-implant-name = Smoke implant +uplink-smoke-implant-desc = Releases a cloud of smoke when activated. diff --git a/Resources/Locale/ru-RU/_white/prototypes/actions/types.ftl b/Resources/Locale/ru-RU/_white/prototypes/actions/types.ftl new file mode 100644 index 0000000000..144adc7844 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/actions/types.ftl @@ -0,0 +1,2 @@ +ent-ActivateSmokeImplant = Выпустить облако дыма + .desc = Выпускает облако дыма вокруг вас. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl new file mode 100644 index 0000000000..94e3a43ed8 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl @@ -0,0 +1,2 @@ +ent-SmokeImplanter = { ent-BaseImplanter } + .desc = { ent-BaseImplanter.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl new file mode 100644 index 0000000000..4ebb6a8da3 --- /dev/null +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl @@ -0,0 +1,2 @@ +ent-SmokeImplant = имплант дыма + .desc = Этот имплант выпускает облако дыма при активации. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl index 8d58a4bc17..ca8bca26b4 100644 --- a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl @@ -9,3 +9,6 @@ uplink-experimental-syndicate-teleporter-desc = Телепортер синди uplink-ebow-name = Маленький энергетический арбалет uplink-ebow-desc = Довольно тихое оружие, которое автоматически перезаряжается и оглушает. Хорошо сочетается с другими видами оружия. + +uplink-smoke-implant-name = Имплант дыма +uplink-smoke-implant-desc = Выпускает облако дыма при активации. \ No newline at end of file diff --git a/Resources/Prototypes/_White/Actions/types.yml b/Resources/Prototypes/_White/Actions/types.yml new file mode 100644 index 0000000000..065c35a5ea --- /dev/null +++ b/Resources/Prototypes/_White/Actions/types.yml @@ -0,0 +1,14 @@ +- type: entity + id: ActivateSmokeImplant + name: Release a cloud of smoke + description: Releases a cloud of smoke around you. + noSpawn: true + components: + - type: InstantAction + useDelay: 20 + itemIconStyle: BigAction + priority: -20 + icon: + sprite: Objects/Weapons/Grenades/smoke.rsi + state: icon + event: !type:ActivateImplantEvent diff --git a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml index c58efd96c6..6909cf513f 100644 --- a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml @@ -50,4 +50,15 @@ blacklist: tags: - NukeOpsUplink - saleLimit: 1 \ No newline at end of file + saleLimit: 1 + +- type: listing + id: UplinkSmokeImplanter + name: uplink-smoke-implant-name + description: uplink-smoke-implant-desc + icon: { sprite: /Textures/Objects/Weapons/Grenades/smoke.rsi, state: icon } + productEntity: SmokeImplanter + cost: + Telecrystal: 2 + categories: + - UplinkImplants \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml new file mode 100644 index 0000000000..79e66eaa3e --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml @@ -0,0 +1,7 @@ +- type: entity + parent: BaseImplantOnlyImplanterSyndi + id: SmokeImplanter + suffix: smoke + components: + - type: Implanter + implant: SmokeImplant \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml new file mode 100644 index 0000000000..9813f190a4 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml @@ -0,0 +1,15 @@ +- type: entity + parent: BaseSubdermalImplant + id: SmokeImplant + name: smoke implant + description: This implant releases smoke cloud on activation. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActivateSmokeImplant + - type: TriggerImplantAction + - type: SmokeOnTrigger + spreadAmount: 25 + duration: 15 + - type: SoundOnTrigger + sound: /Audio/Effects/smoke.ogg \ No newline at end of file From 574de10687d31ae732b31572991ca86d0beef7e4 Mon Sep 17 00:00:00 2001 From: WWDP Changelogs Date: Fri, 11 Oct 2024 04:08:04 +0000 Subject: [PATCH 6/6] Automatic Changelog Update (#79) --- Resources/Changelog/Changelog.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b02e9ac261..7bc901f6f5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -6518,3 +6518,10 @@ Entries: id: 6362 time: '2024-10-11T03:55:38.0000000+00:00' url: https://github.com/WWhiteDreamProject/wwdpublic/pull/81 +- author: Spatison + changes: + - type: Add + message: Added smoke implant / Добавлен имплант дыма + id: 6363 + time: '2024-10-11T04:07:40.0000000+00:00' + url: https://github.com/WWhiteDreamProject/wwdpublic/pull/79