diff --git a/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs b/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs new file mode 100644 index 00000000000..eb84218b8e0 --- /dev/null +++ b/Content.Server/ADT/Hemophilia/HemophiliaSystem.cs @@ -0,0 +1,31 @@ +using Content.Server.Body.Components; +using Content.Shared.Traits; + +namespace Content.Server.Hemophilia; + +public sealed partial class HemophiliaSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInitHemophilia); + SubscribeLocalEvent(OnShutdown); + + } + + private void OnInitHemophilia(EntityUid uid, HemophiliaComponent component, MapInitEvent args) + { + if (TryComp(uid, out var bldcomp)) + { + bldcomp.BleedReductionAmount *= component.Modifier; + } + } + private void OnShutdown(EntityUid uid, HemophiliaComponent component, ComponentShutdown args) + { + if (TryComp(uid, out var bldcomp)) + { + bldcomp.BleedReductionAmount /= component.Modifier; + } + } +} diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index 7041df44481..cde6afeef10 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/Content.Server/Body/Components/BloodstreamComponent.cs @@ -6,10 +6,11 @@ using Content.Shared.FixedPoint; using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Content.Server.Hemophilia; namespace Content.Server.Body.Components { - [RegisterComponent, Access(typeof(BloodstreamSystem), (typeof(ChemistrySystem)))] + [RegisterComponent, Access(typeof(BloodstreamSystem), (typeof(ChemistrySystem)), (typeof(HemophiliaSystem)))] public sealed partial class BloodstreamComponent : Component { public static string DefaultChemicalsSolutionName = "chemicals"; diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs index 92d171d9c74..8e0e4a012bd 100644 --- a/Content.Server/Research/Systems/ResearchSystem.Console.cs +++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs @@ -38,12 +38,14 @@ private void OnConsoleUnlock(EntityUid uid, ResearchConsoleComponent component, if (!UnlockTechnology(uid, args.Id, ent)) return; + + /// try to fix in robust v224.0.0; thanks to languages /*var message = Loc.GetString("research-console-unlock-technology-radio-broadcast", ("technology", Loc.GetString(technologyPrototype.Name)), ("amount", technologyPrototype.Cost)); - _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid); + _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid);*/ SyncClientWithServer(uid); - UpdateConsoleInterface(uid, component);*/ + UpdateConsoleInterface(uid, component); } private void OnConsoleBeforeUiOpened(EntityUid uid, ResearchConsoleComponent component, BeforeActivatableUIOpenEvent args) diff --git a/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs b/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs new file mode 100644 index 00000000000..2a82c95013d --- /dev/null +++ b/Content.Shared/ADT/hemophilia/HemophiliaComponent.cs @@ -0,0 +1,10 @@ +namespace Content.Shared.Traits; + +[RegisterComponent] +public sealed partial class HemophiliaComponent : Component +{ + [DataField] + public float Modifier = 0.3f; + + +} diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 248fd131976..75d09ec9187 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1889,3 +1889,10 @@ Entries: - { message: "Добавлена фигурка Офицера Синего Щита.", type: Add} id: 55760 #костыль отображения в Обновлениях time: '2024-06-09T18:59:00.0000000+00:00' + +- author: Torgovec + changes: + - {message: Добавлено 4 новых плаката, type: Add} + - {message: Теперь нианы могут сьесть берет СИ, type: Fix} + id: 55761 #костыль отображения в Обновлениях + time: '2024-06-23T04:19:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Locale/en-US/ADT/traits/traits.ftl b/Resources/Locale/en-US/ADT/traits/traits.ftl new file mode 100644 index 00000000000..92289cb406e --- /dev/null +++ b/Resources/Locale/en-US/ADT/traits/traits.ftl @@ -0,0 +1,2 @@ +trait-hemophilia-name = Hemophilia +trait-hemophilia-desc = Your blood is clotting extremely badly. diff --git a/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl b/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl index 956737e9440..457f40894ef 100644 --- a/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl +++ b/Resources/Locale/ru-RU/ADT/traits/disabilities.ftl @@ -4,3 +4,6 @@ trait-monochromacy-description = Ваши глаза получили необр trait-nearsighted-name = Близорукость trait-nearsighted-description = Вам требуются очки, чтобы нормально видеть. trait-nearsighted-examined = [color=lightblue]{CAPITALIZE(POSS-ADJ($target))} глаза довольно расфокусированы. Не похоже, что {SUBJECT($target)} может видеть вещи настолько хорошо.[/color] + +trait-hemophilia-name = Гемофилия +trait-hemophilia-desc = Ваша кровь сворачивается крайне плохо. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 6483eb204fe..7fb33f90dcd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -337,3 +337,15 @@ ent-ADTPosterPlasmaMan = Плазма(мены) ent-ADTPosterContrabandRoza = Роза .desc = Символ Атмосии. + +ent-ADTPosterError = Что-то здесь не так + .desc = Кажется кто-то забыл добавить сюда осмысленное изображение + +ent-ADTPosterNoBad = Где-то, но не здесь + .desc = Вы могли бы быть там, если бы не работали на НТ + +ent-ADTPosterNoGood = Где-то, но не тут + .desc = Вы могли бы быть там, если бы вы не работали на НТ + +ent-ADTPosterGasAttack = Газовая атака! + .desc = НТ предупреждает о тритиевых гранатах у синдиката, а так же о саботаже атмоса от вражеских агентов! \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index 1943b9d0930..1b13aaedccf 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -398,6 +398,7 @@ sprite: ADT/Clothing/Head/Hats/beret_CE.rsi - type: Tag tags: + - ClothMade - HamsterWearable - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index 9b3654d556f..d45998c0ea8 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -796,4 +796,45 @@ components: - type: Sprite sprite: ADT/Structures/Wallmounts/space_sec_poster.rsi - state: poster_spacesec \ No newline at end of file + state: poster_spacesec + +# Странные постеры +- type: entity + parent: PosterBase + id: ADTPosterError + name: Error Poster + description: This is an error poster. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndicate.rsi + state: error + +- type: entity + parent: PosterBase + id: ADTPosterNoBad + name: No Bad + description: This poster promotes good behavior. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndicate.rsi + state: nobad + +- type: entity + parent: PosterBase + id: ADTPosterNoGood + name: No Good + description: This poster warns against bad behavior. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndicate.rsi + state: nogood + +- type: entity + parent: PosterBase + id: ADTPosterGasAttack + name: Gas Attack + description: This poster warns about gas attacks. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndicate.rsi + state: gasattack diff --git a/Resources/Prototypes/ADT/Traits/neutral.yml b/Resources/Prototypes/ADT/Traits/neutral.yml index 79fa48c9573..fc0ff0e508e 100644 --- a/Resources/Prototypes/ADT/Traits/neutral.yml +++ b/Resources/Prototypes/ADT/Traits/neutral.yml @@ -3,4 +3,12 @@ name: trait-moth-accent-name description: trait-moth-accent-desc components: - - type: MothAccent \ No newline at end of file + - type: MothAccent + +- type: trait + id: ADTHemophilia + name: trait-hemophilia-name + description: trait-hemophilia-desc + components: + - type: Hemophilia + modifier: 0.01 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 9e7caea8eab..da59e5a6c4d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -103,6 +103,8 @@ - ADTPosterLustyMoth - ADTPosterWatchOutChem - ADTPosterPanem + - ADTPosterGasAttack + - ADTPosterNoGood chance: 1 - type: entity @@ -172,4 +174,6 @@ - ADTPosterDontTalkToArty - ADTPosterWorkUnderWay - ADTPosterPlasmaMan + - ADTPosterError + - ADTPosterNoBad chance: 1 diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/error.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/error.png new file mode 100644 index 00000000000..c19ea8e9c06 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/error.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/gasattack.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/gasattack.png new file mode 100644 index 00000000000..495df75ae34 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/gasattack.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/meta.json new file mode 100644 index 00000000000..6fa91bd51af --- /dev/null +++ b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:unlumy для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "error" + }, + { + "name": "nobad" + }, + { + "name": "nogood" + }, + { + "name": "gasattack" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/nobad.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/nobad.png new file mode 100644 index 00000000000..94f2a5a7ee3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/nobad.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/nogood.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/nogood.png new file mode 100644 index 00000000000..d2ab25c1d23 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_syndicate.rsi/nogood.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png index fe56e9f4da4..18cb58c81b0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_open_unlit.png new file mode 100644 index 00000000000..f69f2a124e9 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png index 4e0bdad1a13..b070cf3155f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png index b02200b2ce6..fc8b201873c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_open_unlit.png new file mode 100644 index 00000000000..0b3ace14108 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json index f686706dd30..f7bec18e87f 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json @@ -8,17 +8,23 @@ }, "states": [ { - "name": "assembly" - }, - { - "name": "bolted_unlit" - }, + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "bolted_open_unlit" + }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -61,8 +67,8 @@ { "name": "open", "delays": [ - [ - 1 + [ + 1 ] ] }, @@ -105,6 +111,9 @@ ] ] }, + { + "name": "panel_closed" + }, { "name": "panel_open", "delays": [ @@ -162,6 +171,9 @@ 0.4 ] ] + }, + { + "name": "emergency_open_unlit" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open_unlit.png new file mode 100644 index 00000000000..18bc3db5a5a Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png index b4801197c27..c629103818b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closed.png new file mode 100644 index 00000000000..4c59d3a28cc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closed.png differ