diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml index 44e9ffeaa8..865e7a9339 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml @@ -224,6 +224,8 @@ + + diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs index a6470dc180..53c18b980a 100644 --- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs @@ -609,10 +609,10 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt #if LPP_Sponsors // Lost Paradise Donate Preferences #region Donate - + LPPDonates.Orphan(); var donate = prototypeManager.EnumeratePrototypes().OrderBy(t => Loc.GetString(t.Name)).ToList(); _donatePreferences = new List<_LostParadise.Donate.DonatePreferenceSelector>(); - _tabContainer.SetTabTitle(5, Loc.GetString("lost-donate-editor")); + _tabContainer.AddTab(LPPDonates, Loc.GetString("lost-donate-editor")); var granted = false; if (donate.Count > 0) { diff --git a/Content.Shared/_LostParadise/Polymorphism/AngelDustComponent.cs b/Content.Shared/_LostParadise/Polymorphism/AngelDustComponent.cs index 6e024d2efb..559b9727e9 100644 --- a/Content.Shared/_LostParadise/Polymorphism/AngelDustComponent.cs +++ b/Content.Shared/_LostParadise/Polymorphism/AngelDustComponent.cs @@ -15,10 +15,10 @@ namespace Content.Shared._LostParadise.AngelDust.Components; public sealed partial class AngelDustComponent : Component { [DataField] - public EntProtoId TestAction = "LPPAngelDustPolymorph"; + public EntProtoId TestAction = "";//"LPPAngelDustPolymorph"; [DataField("morph")] - public ProtoId AngelDustPolymorphId = "LPPAngelDustYukiDeMorph"; + public ProtoId AngelDustPolymorphId = "";//"LPPAngelDustYukiDeMorph"; [DataField] public EntityUid? Action; diff --git a/Resources/Locale/ru-RU/cluwne/cluwne.ftl b/Resources/Locale/ru-RU/cluwne/cluwne.ftl index f99fcc1ba4..8b882700f6 100644 --- a/Resources/Locale/ru-RU/cluwne/cluwne.ftl +++ b/Resources/Locale/ru-RU/cluwne/cluwne.ftl @@ -1,2 +1,2 @@ cluwne-transform = { CAPITALIZE($target) } превратился в клувеня! -cluwne-name-prefix = клувень { $baseName } +cluwne-name-prefix = клувень {$target} diff --git a/Resources/Locale/ru-RU/glue/glue.ftl b/Resources/Locale/ru-RU/glue/glue.ftl index bac1447a43..d9057c391e 100644 --- a/Resources/Locale/ru-RU/glue/glue.ftl +++ b/Resources/Locale/ru-RU/glue/glue.ftl @@ -1,5 +1,5 @@ glue-success = Вы покрыли { $target } клеем! -glued-name-prefix = липкий { $baseName } +glued-name-prefix = липкий {$target} glue-failure = Не удалось покрыть { $target } клеем. glue-verb-text = Нанести клей glue-verb-message = Покрыть предмет клеем diff --git a/Resources/Locale/ru-RU/lube/lube.ftl b/Resources/Locale/ru-RU/lube/lube.ftl index cdd46c4f57..11d3be8793 100644 --- a/Resources/Locale/ru-RU/lube/lube.ftl +++ b/Resources/Locale/ru-RU/lube/lube.ftl @@ -1,5 +1,5 @@ lube-success = Вы покрыли { $target } смазкой! -lubed-name-prefix = смазанный { $baseName } +lubed-name-prefix = смазанный {$target} lube-failure = Не удалось покрыть { $target } смазкой! lube-slip = { $target } выскальзывает из ваших рук! lube-verb-text = Нанести смазку diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index f7191df9ab..ca459f1783 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 1500 + cost: 2700 category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml index 4eec014f11..b3ab364ab2 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml @@ -22,6 +22,9 @@ - type: Airtight noAirWhenFullyAirBlocked: false - type: Clickable + - type: Construction + graph: AtmosDeviceFanTiny + node: AtmosDeviceFanTiny - type: Tag tags: - SpreaderIgnore diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml index e0247001f2..f1a47facca 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml @@ -20,6 +20,9 @@ - type: Physics bodyType: Static canCollide: false + - type: Construction + graph: FloorDrain + node: FloorDrain - type: AmbientSound enabled: false volume: -8 diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/ai_mech.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/ai_mech.yml index 818d7dfe7b..c473b7ee88 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/ai_mech.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/ai_mech.yml @@ -1,144 +1,144 @@ -- type: entity - id: LPPAiMechNT - name: мех "Протекторн" МК 1 - description: Махина несущая боезапас боевого корабля, крайне опасен в бою с живой силой. - parent: BaseBorgChassis - components: - - type: Sprite - sprite: _LostParadise/Mobs/Silicon/nt_ai_mech.rsi - layers: - - state: robot - - state: robot_e_r - map: ["enum.BorgVisualLayers.Light"] - shader: unshaded - visible: false - - state: robot_l - shader: unshaded - map: ["light"] - visible: false - - type: MovementSpeedModifier - baseWalkSpeed : 3 - baseSprintSpeed : 4 - - type: MobState - allowedStates: - - Alive - - Critical - - Dead - - type: MobThresholds - thresholds: - 0: Alive - 300: Critical - 400: Dead - - type: SiliconLawProvider - laws: LPPNTDefaultSecurityLaws - - type: Buckle - - type: BorgChassis - maxModules: 1 - moduleWhitelist: - tags: - - LPPAIMechPunchAndVulcan - hasMindState: robot_e - noMindState: robot_e_r - - type: Construction - node: security - - type: Speech - speechVerb: Robotic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 350 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/_LostParadise/Machines/drone_warning.ogg - params: - volume: 5 - - trigger: - !type:DamageTrigger - damage: 550 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/_LostParadise/Machines/drone_destory.ogg - params: - volume: 5 - - type: IntrinsicRadioTransmitter - channels: - - Binary - - Common - - CentCom - - Supply - - Command - - Engineering - - Medical - - Science - - Security - - Service - - type: ActiveRadio - channels: - - Binary - - Common - - CentCom - - Supply - - Command - - Engineering - - Medical - - Science - - Security - - Service - - type: AccessReader - access: [["CentralCommand"]] - # - type: ShowSecurityIcons - - type: Inventory - templateId: borgTall - - type: TTS - voice: Robo1 - - type: ShowHealthBars - damageContainers: - - Biological - - Inorganic - - Silicon - - type: ShowHealthIcons - damageContainers: - - Biological - - type: FootstepModifier - footstepSoundCollection: - path: /Audio/Mecha/sound_mecha_powerloader_step.ogg - - type: ContainerFill - containers: - borg_brain: - - PositronicBrain - borg_module: - - LPPAIMechModulePunchAndVulcan - - type: ItemSlots - slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - startingItem: PowerCellHyper - - type: Tag - tags: - - CannotSuicide - - FootstepSound - - HudSecurity - - DoorBumpOpener - - type: Puller - - type: Tool - speed: 1.5 - qualities: - - Prying - - type: Prying - pryPowered: !type:Bool - true - force: !type:Bool - true - useSound: - path: /Audio/Items/crowbar.ogg - - type: NpcFactionMember - factions: - - NanoTrasen - - type: Access - enabled: false - groups: - - AllAccess - - type: ShowSecurityIcons +# - type: entity +# id: LPPAiMechNT +# name: мех "Протекторн" МК 1 +# description: Махина несущая боезапас боевого корабля, крайне опасен в бою с живой силой. +# parent: BaseBorgChassis +# components: +# - type: Sprite +# sprite: _LostParadise/Mobs/Silicon/nt_ai_mech.rsi +# layers: +# - state: robot +# - state: robot_e_r +# map: ["enum.BorgVisualLayers.Light"] +# shader: unshaded +# visible: false +# - state: robot_l +# shader: unshaded +# map: ["light"] +# visible: false +# - type: MovementSpeedModifier +# baseWalkSpeed : 3 +# baseSprintSpeed : 4 +# - type: MobState +# allowedStates: +# - Alive +# - Critical +# - Dead +# - type: MobThresholds +# thresholds: +# 0: Alive +# 300: Critical +# 400: Dead +# - type: SiliconLawProvider +# laws: LPPNTDefaultSecurityLaws +# - type: Buckle +# - type: BorgChassis +# maxModules: 1 +# moduleWhitelist: +# tags: +# - LPPAIMechPunchAndVulcan +# hasMindState: robot_e +# noMindState: robot_e_r +# # - type: Construction +# # node: security +# - type: Speech +# speechVerb: Robotic +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 350 +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/_LostParadise/Machines/drone_warning.ogg +# params: +# volume: 5 +# - trigger: +# !type:DamageTrigger +# damage: 550 +# behaviors: +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/_LostParadise/Machines/drone_destory.ogg +# params: +# volume: 5 +# - type: IntrinsicRadioTransmitter +# channels: +# - Binary +# - Common +# - CentCom +# - Supply +# - Command +# - Engineering +# - Medical +# - Science +# - Security +# - Service +# - type: ActiveRadio +# channels: +# - Binary +# - Common +# - CentCom +# - Supply +# - Command +# - Engineering +# - Medical +# - Science +# - Security +# - Service +# - type: AccessReader +# access: [["CentralCommand"]] +# # - type: ShowSecurityIcons +# - type: Inventory +# templateId: borgTall +# - type: TTS +# voice: Robo1 +# - type: ShowHealthBars +# damageContainers: +# - Biological +# - Inorganic +# - Silicon +# - type: ShowHealthIcons +# damageContainers: +# - Biological +# - type: FootstepModifier +# footstepSoundCollection: +# path: /Audio/Mecha/sound_mecha_powerloader_step.ogg +# - type: ContainerFill +# containers: +# borg_brain: +# - PositronicBrain +# borg_module: +# - LPPAIMechModulePunchAndVulcan +# - type: ItemSlots +# slots: +# cell_slot: +# name: power-cell-slot-component-slot-name-default +# startingItem: PowerCellHyper +# - type: Tag +# tags: +# - CannotSuicide +# - FootstepSound +# - HudSecurity +# - DoorBumpOpener +# - type: Puller +# - type: Tool +# speed: 1.5 +# qualities: +# - Prying +# - type: Prying +# pryPowered: !type:Bool +# true +# force: !type:Bool +# true +# useSound: +# path: /Audio/Items/crowbar.ogg +# - type: NpcFactionMember +# factions: +# - NanoTrasen +# - type: Access +# enabled: false +# groups: +# - AllAccess +# - type: ShowSecurityIcons diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/battle-chelnok/security.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/battle-chelnok/security.yml index e3a7638d8e..10a88d115c 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/battle-chelnok/security.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/NPCs/battle-chelnok/security.yml @@ -34,7 +34,7 @@ hasMindState: robot_e noMindState: robot_e_r # name: security chellnock - - type: Construction - node: security + # - type: Construction + # node: security - type: Speech speechVerb: Robotic diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/base.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/base.yml index 14d7c9dc3e..04ed8499de 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/base.yml @@ -5,7 +5,7 @@ id: LPPBaseMob abstract: true components: - - type: CanBeBorgNTEnemy + # - type: CanBeBorgNTEnemy - type: Sprite noRot: true drawdepth: Mobs @@ -45,7 +45,7 @@ - type: Polymorphable - type: StatusIcon - type: TTS # Corvax-TTS - - type: ShortExamine + # - type: ShortExamine - type: RequireProjectileTarget active: False - type: LanguageKnowledge diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/Industrial.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/Industrial.yml index 9ff1ff6683..f2423cb29d 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Lathes/Industrial.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/Industrial.yml @@ -6,13 +6,13 @@ Plastic: 500 Glass: 300 -- type: latheRecipe - id: LPPSecHud - result: ClothingEyesHudSecurity - completetime: 10 - materials: - Plastic: 500 - Glass: 300 +# - type: latheRecipe +# id: LPPSecHud +# result: ClothingEyesHudSecurity +# completetime: 10 +# materials: +# Plastic: 500 +# Glass: 300 - type: latheRecipe id: LPPRedHudGlasses