Skip to content

Commit

Permalink
Merge pull request #81 from SpicyDarkFox/dbg
Browse files Browse the repository at this point in the history
Фиксы пост-обновления
  • Loading branch information
Evgencheg authored Sep 6, 2024
2 parents 5789a8d + 0d5c7a8 commit 7b3c530
Show file tree
Hide file tree
Showing 13 changed files with 171 additions and 163 deletions.
2 changes: 2 additions & 0 deletions Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="DonateList" Orientation="Vertical" />
</ScrollContainer>

<ui:NeoTabContainer Name="LPPDonates" VerticalExpand="True" SeparatorMargin="0" />
</BoxContainer>
<!-- Lost Paradise Donate Preferences End -->
<BoxContainer Name="CMarkingsTab" HorizontalExpand="True" Orientation="Vertical" Margin="10">
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -609,10 +609,10 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt

#if LPP_Sponsors // Lost Paradise Donate Preferences
#region Donate

LPPDonates.Orphan();
var donate = prototypeManager.EnumeratePrototypes<Shared._LostParadise.Donate.DonatePrototype>().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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<PolymorphPrototype> AngelDustPolymorphId = "LPPAngelDustYukiDeMorph";
public ProtoId<PolymorphPrototype> AngelDustPolymorphId = "";//"LPPAngelDustYukiDeMorph";

[DataField]
public EntityUid? Action;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/cluwne/cluwne.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cluwne-transform = { CAPITALIZE($target) } превратился в клувеня!
cluwne-name-prefix = клувень { $baseName }
cluwne-name-prefix = клувень {$target}
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/glue/glue.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
glue-success = Вы покрыли { $target } клеем!
glued-name-prefix = липкий { $baseName }
glued-name-prefix = липкий {$target}
glue-failure = Не удалось покрыть { $target } клеем.
glue-verb-text = Нанести клей
glue-verb-message = Покрыть предмет клеем
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/lube/lube.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lube-success = Вы покрыли { $target } смазкой!
lubed-name-prefix = смазанный { $baseName }
lubed-name-prefix = смазанный {$target}
lube-failure = Не удалось покрыть { $target } смазкой!
lube-slip = { $target } выскальзывает из ваших рук!
lube-verb-text = Нанести смазку
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
- type: Airtight
noAirWhenFullyAirBlocked: false
- type: Clickable
- type: Construction
graph: AtmosDeviceFanTiny
node: AtmosDeviceFanTiny
- type: Tag
tags:
- SpreaderIgnore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
- type: Physics
bodyType: Static
canCollide: false
- type: Construction
graph: FloorDrain
node: FloorDrain
- type: AmbientSound
enabled: false
volume: -8
Expand Down
288 changes: 144 additions & 144 deletions Resources/Prototypes/_LostParadise/Entities/Mobs/Cryborgs/ai_mech.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
id: LPPBaseMob
abstract: true
components:
- type: CanBeBorgNTEnemy
# - type: CanBeBorgNTEnemy
- type: Sprite
noRot: true
drawdepth: Mobs
Expand Down Expand Up @@ -45,7 +45,7 @@
- type: Polymorphable
- type: StatusIcon
- type: TTS # Corvax-TTS
- type: ShortExamine
# - type: ShortExamine
- type: RequireProjectileTarget
active: False
- type: LanguageKnowledge
Expand Down
Loading

0 comments on commit 7b3c530

Please sign in to comment.