From d81f84b192798c892288c5fdc72e0f3faf2ce0ba Mon Sep 17 00:00:00 2001 From: 778b Date: Sat, 27 Apr 2024 19:42:05 +0400 Subject: [PATCH] Merge with our changes --- .../Corvax/TTS/HumanoidProfileEditor.TTS.cs | 5 +- .../Rules/TS/MasterRORuleSystem.cs | 2 + Content.Server/Ghost/Roles/GhostRoleSystem.cs | 1 + .../Power/EntitySystems/HandChargerSystem.cs | 10 +- .../Structures/Doors/Airlocks/highsec.yml | 109 ------------------ .../Clothing/Head/hardsuit-helmets.yml | 3 +- .../Clothing/Head/hardsuit-marine-helmets.yml | 3 +- .../Entities/Objects/Specific/hypospray.yml | 4 +- .../Interface/Misc/job_icons.rsi/meta.json | 8 +- 9 files changed, 19 insertions(+), 126 deletions(-) diff --git a/Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs b/Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs index d12b6f6879..c5cf424d48 100644 --- a/Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs +++ b/Content.Client/Corvax/TTS/HumanoidProfileEditor.TTS.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Client.Corvax.TTS; using Content.Client.Lobby; using Content.Shared.Corvax.TTS; @@ -11,7 +11,4 @@ public sealed partial class HumanoidProfileEditor { private IClientSponsorsManager? _sponsorsMgr; private List _voiceList = default!; - - - } } diff --git a/Content.Server/GameTicking/Rules/TS/MasterRORuleSystem.cs b/Content.Server/GameTicking/Rules/TS/MasterRORuleSystem.cs index 7ebdb89291..c9f3ef1710 100644 --- a/Content.Server/GameTicking/Rules/TS/MasterRORuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TS/MasterRORuleSystem.cs @@ -2,6 +2,7 @@ using System.Numerics; using Content.Server.Antag; using Content.Server.Chat.Systems; +using Content.Server.GameTicking.Components; using Content.Server.GameTicking.Rules.Components; using Content.Server.Jobs; using Content.Server.NPC.Components; @@ -15,6 +16,7 @@ using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Mobs.Systems; +using Content.Shared.NPC.Systems; using Robust.Server.GameObjects; using Robust.Server.Maps; using Robust.Shared.Map; diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs index e8c8c65623..e3d4b38f89 100644 --- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs @@ -43,6 +43,7 @@ public sealed class GhostRoleSystem : EntitySystem [Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly SharedMindSystem _mindSystem = default!; [Dependency] private readonly SharedRoleSystem _roleSystem = default!; + [Dependency] private readonly PlayTimeTrackingSystem _playTimeTrackings = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; private uint _nextRoleIdentifier; diff --git a/Content.Server/Power/EntitySystems/HandChargerSystem.cs b/Content.Server/Power/EntitySystems/HandChargerSystem.cs index ef0b85c779..f196fa606e 100644 --- a/Content.Server/Power/EntitySystems/HandChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/HandChargerSystem.cs @@ -13,6 +13,7 @@ internal sealed class HandChargerSystem : EntitySystem { [Dependency] private readonly ContainerSystem _container = default!; [Dependency] private readonly PowerCellSystem _powerCell = default!; + [Dependency] private readonly BatterySystem _battery = default!; [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; public override void Update(float frameTime) @@ -77,18 +78,19 @@ private void TransferPower(EntityUid uid, BatteryComponent batteryToDischarge, L if (batteryToDischarge.CurrentCharge < deltaChargeRate) { chargeRate = batteryToDischarge.CurrentCharge / batteryToCharge.Count * frameTime; - batteryToDischarge.CurrentCharge = 0; + _battery.SetCharge(uid, 0, batteryToDischarge); } else - batteryToDischarge.CurrentCharge -= deltaChargeRate; + _battery.SetCharge(uid, batteryToDischarge.CurrentCharge - deltaChargeRate, batteryToDischarge); foreach (var tempBattery in batteryToCharge) { - tempBattery.CurrentCharge += chargeRate; + _battery.SetCharge(uid, tempBattery.CurrentCharge + chargeRate, batteryToDischarge); + // Just so the sprite won't be set to 99.99999% visibility if (tempBattery.MaxCharge - tempBattery.CurrentCharge < 0.01 || tempBattery.CurrentCharge > tempBattery.MaxCharge) { - tempBattery.CurrentCharge = tempBattery.MaxCharge; + _battery.SetCharge(uid, tempBattery.MaxCharge, batteryToDischarge); } } } diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml index 326bdfd526..d02f307abb 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml @@ -1,111 +1,3 @@ -<<<<<<< HEAD -- type: entity - id: HighSecDoor - parent: BaseStructure - name: high security door - description: Keeps the bad out and keeps the good in. - placement: - mode: SnapgridCenter - components: - - type: InteractionOutline - - type: Sprite - sprite: Structures/Doors/Airlocks/highsec/highsec.rsi - layers: - - state: closed - map: ["enum.DoorVisualLayers.Base"] - - state: closed_unlit - shader: unshaded - map: ["enum.DoorVisualLayers.BaseUnlit"] - - state: welded - map: ["enum.WeldableLayers.BaseWelded"] - - state: bolted_unlit - shader: unshaded - map: ["enum.DoorVisualLayers.BaseBolted"] - - state: emergency_unlit - map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] - shader: unshaded - - state: panel_open - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: AnimationPlayer - - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close - density: 100 - mask: - - FullTileMask - layer: - - WallLayer - - type: ContainerFill - containers: - board: [ DoorElectronics ] - - type: ContainerContainer - containers: - board: !type:Container - - type: Door - crushDamage: - types: - Blunt: 50 - openSound: - path: /Audio/Machines/airlock_open.ogg - closeSound: - path: /Audio/Machines/airlock_close.ogg - denySound: - path: /Audio/Machines/airlock_deny.ogg - - type: Weldable - time: 10 - - type: Airlock - openUnlitVisible: true # Corvax-Resprite-Airlocks - - type: NavMapDoor - - type: DoorBolt - - type: AccessReader - - type: Appearance - - type: WiresVisuals - - type: ApcPowerReceiver - powerLoad: 20 - - type: ExtensionCableReceiver - - type: Electrified - enabled: false - usesApcPower: true - - type: WiresPanel - - type: WiresPanelSecurity - securityLevel: maxSecurity - - type: Wires - boardName: wires-board-name-highsec - layoutId: HighSec - alwaysRandomize: true - - type: UserInterface - interfaces: - - key: enum.WiresUiKey.Key - type: WiresBoundUserInterface - - type: Airtight - fixVacuum: true - - type: Occluder - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: StrongMetallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 1500 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: IconSmooth - key: walls - mode: NoSprite - - type: Construction - graph: Airlock - node: highSecDoor - - type: Tag - tags: - - HighSecDoor - # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor -======= - type: entity id: HighSecDoor parent: BaseStructure @@ -213,4 +105,3 @@ tags: - HighSecDoor # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor ->>>>>>> 9034dc4cf2f02e315ac62efcd3d78de321c47e74 diff --git a/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-helmets.yml index aaf58dfa61..f1506ee932 100644 --- a/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-helmets.yml @@ -59,7 +59,7 @@ # OBH-3 - type: entity noSpawn: true - parent: ClothingHeadHardsuitWithLightBase + parent: [ClothingHeadHardsuitWithLightBase, ShowSecurityIcons] id: ClothingHeadHelmetHardsuitOBH3S name: OBH-3S description: Modern armor helmet, version 3, space edition @@ -85,7 +85,6 @@ Heat: 0.9 Cold: 0.9 Radiation: 0.9 - - type: ShowSecurityIcons - type: FlashImmunity diff --git a/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-marine-helmets.yml b/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-marine-helmets.yml index 0fa7489b6d..8fa6a8fdd5 100644 --- a/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-marine-helmets.yml +++ b/Resources/Prototypes/TS/Entities/Clothing/Head/hardsuit-marine-helmets.yml @@ -1,12 +1,11 @@ # OBH-4 - type: entity abstract: true - parent: BaseItem + parent: [BaseItem, ShowSecurityIcons] id: ClothingHelmetHardsuitOBH4Base components: - type: Clickable - type: BreathMask - - type: ShowSecurityIcons - type: FlashImmunity - type: InteractionOutline - type: TemperatureProtection diff --git a/Resources/Prototypes/TS/Entities/Objects/Specific/hypospray.yml b/Resources/Prototypes/TS/Entities/Objects/Specific/hypospray.yml index e2ee21116f..cd0e405ca5 100644 --- a/Resources/Prototypes/TS/Entities/Objects/Specific/hypospray.yml +++ b/Resources/Prototypes/TS/Entities/Objects/Specific/hypospray.yml @@ -18,8 +18,8 @@ - type: ExaminableSolution solution: hypospray - type: Hypospray - onlyMobs: false + onlyAffectsMobs: false - type: UseDelay delay: 5 - type: StaticPrice - price: 750 \ No newline at end of file + price: 750 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 5626e4c969..51ebdfd9e2 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -189,7 +189,6 @@ { "name": "Visitor" }, - { "name": "CompanyCommander" }, @@ -218,7 +217,10 @@ "name": "MilitaryBorg" }, { - "name": "MechPilot" { - "name": "InitialInfected" } + "name": "MechPilot" + }, + { + "name": "InitialInfected" + } ] }