diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 08e58360fa..47ce0c3ca2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -6502,3 +6502,33 @@ 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 +- 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 +- 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 +- author: Spatison + changes: + - type: Add + message: Added syndicate implanter / Добавлен имплантер синдиката + id: 6364 + time: '2024-10-11T04:26:13.0000000+00:00' + url: https://github.com/WWhiteDreamProject/wwdpublic/pull/78 diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl index 9783c75bd2..38e64879eb 100644 --- a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl @@ -11,4 +11,10 @@ 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-neuro-control = Neuro stabilization implanter -uplink-neuro-control-desc = Blocks all of the incoming stamina damage while dealing shock damage instead. \ No newline at end of file +uplink-neuro-control-desc = Blocks all of the incoming stamina damage while dealing shock damage instead. + +uplink-implanter-name = Implanter +uplink-implanter-desc = An advanced implant that allows you to quickly insert and remove implants. + +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 index c3e61f3136..788abf0a8a 100644 --- a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl @@ -1,3 +1,9 @@ ent-NeuroStabilizationImplanter = { ent-BaseImplanter } .desc = { ent-BaseImplanter.desc } - .suffix = нейро стабилизация \ No newline at end of file + .suffix = нейро стабилизация + +ent-ImplanterSyndi = { ent-BaseImplanter } + .desc = Компактный одноразовый шприц, предназначенный исключительно для введения и извлечения подкожных имплантатов. + +ent-SmokeImplanter = { ent-BaseImplanter } + .desc = { ent-BaseImplanter.desc } 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 index 730fea53dd..02d7d7bdf4 100644 --- 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 @@ -1,2 +1,5 @@ ent-NeuroStabilizationImplant = имплант нейро стабализации - .desc = Блокирует весь входящий урон по выносливости за счет шока. \ No newline at end of file + .desc = Блокирует весь входящий урон по выносливости за счет шока. + +ent-SmokeImplant = имплант дыма + .desc = Этот имплант выпускает облако дыма при активации. diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl index d7aec3171f..0149d91986 100644 --- a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl @@ -11,4 +11,10 @@ uplink-ebow-name = Маленький энергетический арбале uplink-ebow-desc = Довольно тихое оружие, которое автоматически перезаряжается и оглушает. Хорошо сочетается с другими видами оружия. uplink-neuro-control = Имплант нейро стабилизации -uplink-neuro-control-desc = Блокирует весь входящий урон по выносливости, компенсируя его шоковым зарядом, наносящим урон, пропорциональный заблокированному. \ No newline at end of file +uplink-neuro-control-desc = Блокирует весь входящий урон по выносливости, компенсируя его шоковым зарядом, наносящим урон, пропорциональный заблокированному. + +uplink-implanter-name = Имплантер +uplink-implanter-desc = Продвинутый имплантер, позволяющий быстро вкалывать и вытаскивать импланты. + +uplink-smoke-implant-name = Имплант дыма +uplink-smoke-implant-desc = Выпускает облако дыма при активации. diff --git a/Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl index eb02b08eac..07672cfe3b 100644 --- a/Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl +++ b/Resources/Locale/ru-RU/prototypes/entities/objects/misc/implanters.ftl @@ -52,5 +52,3 @@ ent-DeathAcidifierImplanter = { ent-BaseImplanter } ent-ImplanterAdmeme = { ent-BaseImplanter } .desc = {""} .suffix = адмемы -ent-ImplanterSyndi = { ent-BaseImplanter } - .desc = { ent-BaseImplanter.desc } 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 diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index d42af179a0..b6648b3bd4 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/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 bd5ccb423d..fd6b69be96 100644 --- a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml @@ -59,4 +59,25 @@ cost: Telecrystal: 2 categories: - - UplinkImplants \ No newline at end of file + - UplinkImplants + +- type: listing + id: UplinkImplanterSyndi + name: uplink-implanter-name + description: uplink-implanter-desc + productEntity: ImplanterSyndi + cost: + Telecrystal: 1 + categories: + - UplinkImplants + +- 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 diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml index 063329bf54..43d1bbd593 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml @@ -4,4 +4,25 @@ suffix: neuro stabilization components: - type: Implanter - implant: NeuroStabilizationImplant \ No newline at end of file + implant: NeuroStabilizationImplant + +- type: entity + parent: Implanter + id: ImplanterSyndi + description: A compact disposable syringe exclusively designed for the quick injection and extraction of subdermal implants. + components: + - type: Item + sprite: Objects/Specific/Medical/syndi_implanter.rsi + - type: Sprite + sprite: Objects/Specific/Medical/syndi_implanter.rsi + - type: Implanter + drawTime: 2 + implantTime: 2 + +- type: entity + parent: BaseImplantOnlyImplanterSyndi + id: SmokeImplanter + suffix: smoke + components: + - type: Implanter + implant: SmokeImplant diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml index b6a884e451..1a727e98ad 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml @@ -8,4 +8,20 @@ - type: SubdermalImplant - type: Tag tags: - - NeuroStabilization \ No newline at end of file + - NeuroStabilization + +- 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 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