diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index bbf12ed3fa..9617ed1619 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -485,7 +485,7 @@ public sealed partial class ChatSystem : SharedChatSystem } var admins = _adminManager.ActiveAdmins - .Select(p => p.ConnectedClient); + .Select(p => p.Channel); string messageWrap; string adminMessageWrap; diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index d545af3451..a783182b45 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -369,7 +369,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem _chatSystem.DispatchStationAnnouncement( result.Station, Loc.GetString("emergency-shuttle-good-luck"), - playDefaultSound: false); + playDefault: false); // TODO: Need filter extensions or something don't blame me. return; @@ -414,7 +414,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem { [ShuttleTimerMasks.ShuttleMap] = shuttle, [ShuttleTimerMasks.SourceMap] = targetXform.MapUid, - [ShuttleTimerMasks.DestMap] = _roundEnd.GetCentcomm(), + [ShuttleTimerMasks.DestMap] = _roundEnd.GetTransitHub(), [ShuttleTimerMasks.ShuttleTime] = time, [ShuttleTimerMasks.SourceTime] = time, [ShuttleTimerMasks.DestTime] = time + TimeSpan.FromSeconds(TransitTime), diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs index ff8a7a7334..012a24b97b 100644 --- a/Content.Server/Zombies/ZombieSystem.cs +++ b/Content.Server/Zombies/ZombieSystem.cs @@ -47,6 +47,7 @@ namespace Content.Server.Zombies [Dependency] private readonly ActionsSystem _action = default!; [Dependency] private readonly SharedStunSystem _stun = default!; [Dependency] private readonly NavMapSystem _navMap = default!; // Sunrise-Zombies + [Dependency] private readonly SharedTransformSystem _transform = default!; public const SlotFlags ProtectiveSlots = SlotFlags.FEET | @@ -166,7 +167,7 @@ namespace Content.Server.Zombies args.Handled = true; var xform = Transform(uid); - var mapCoords = args.Target.ToMap(EntityManager); + var mapCoords = args.Target.ToMap(EntityManager, _transform); var direction = mapCoords.Position - xform.MapPosition.Position; if (direction.Length() > component.MaxThrow) diff --git a/Content.Server/_Sunrise/Carrying/CarryingSystem.cs b/Content.Server/_Sunrise/Carrying/CarryingSystem.cs index 244d9e1de9..cd4271eba9 100644 --- a/Content.Server/_Sunrise/Carrying/CarryingSystem.cs +++ b/Content.Server/_Sunrise/Carrying/CarryingSystem.cs @@ -257,9 +257,8 @@ namespace Content.Server._Sunrise.Carrying _pullingSystem.TryStopPull(carried, pullable, carrier); Transform(carrier).AttachToGridOrMap(); - Transform(carried).AttachToGridOrMap(); Transform(carried).Coordinates = Transform(carrier).Coordinates; - Transform(carried).AttachParent(Transform(carrier)); + Transform(carried).AttachParent(carrier); _virtualItemSystem.TrySpawnVirtualItemInHand(carried, carrier); _virtualItemSystem.TrySpawnVirtualItemInHand(carried, carrier); var carryingComp = EnsureComp(carrier); @@ -274,7 +273,7 @@ namespace Content.Server._Sunrise.Carrying } public void DropCarried(EntityUid carrier, EntityUid carried) - { + { RemComp(carrier); // get rid of this first so we don't recusrively fire that event RemComp(carrier); RemComp(carried); diff --git a/Content.Server/_Sunrise/Fugitive/FugitiveSpawner.cs b/Content.Server/_Sunrise/Fugitive/FugitiveSpawner.cs index 1a9817f1c3..c8aaa6d4a8 100644 --- a/Content.Server/_Sunrise/Fugitive/FugitiveSpawner.cs +++ b/Content.Server/_Sunrise/Fugitive/FugitiveSpawner.cs @@ -13,6 +13,7 @@ using Robust.Server.Audio; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.Map; +using Robust.Shared.Map.Components; using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -46,7 +47,7 @@ namespace Content.Server._Sunrise.Fugitive var xform = Transform(uid); var fugitive = Spawn(component.Prototype, xform.Coordinates); - if (TryComp<_Sunrise.Fugitive.FugitiveCountdownComponent>(fugitive, out var cd)) + if (TryComp(fugitive, out var cd)) cd.AnnounceTime = _timing.CurTime + cd.AnnounceCD; _popupSystem.PopupEntity(Loc.GetString("fugitive-spawn", ("name", fugitive)), fugitive, @@ -57,7 +58,7 @@ namespace Content.Server._Sunrise.Fugitive _stun.TryParalyze(fugitive, TimeSpan.FromSeconds(2), false); _audioSystem.PlayPvs(component.SpawnSoundPath, uid, AudioParams.Default.WithVolume(-6f)); - if (!_mapManager.TryGetGrid(xform.GridUid, out var map)) + if (!TryComp(xform.GridUid, out var map)) return; var currentTile = map.GetTileRef(xform.Coordinates); _tile.PryTile(currentTile); diff --git a/Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs b/Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs index 9d51e3227f..64d8d83606 100644 --- a/Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs +++ b/Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs @@ -18,6 +18,7 @@ public sealed partial class NPCSleepSystem : EntitySystem [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly NPCSystem _npcSystem = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; public bool Enabled { get; set; } = true; @@ -79,7 +80,7 @@ public sealed partial class NPCSleepSystem : EntitySystem private bool AllowNpc(EntityUid uid) { var xform = Transform(uid); - var npcCoords = xform.Coordinates.ToMap(EntityManager); + var npcCoords = xform.Coordinates.ToMap(EntityManager, _transform); var npcMapId = xform.MapID; foreach (var playerSession in _playerManager.SessionsDict) @@ -93,7 +94,7 @@ public sealed partial class NPCSleepSystem : EntitySystem if (npcMapId != playerMapId) continue; - var playerCoords = xformPlayer.Coordinates.ToMap(EntityManager); + var playerCoords = xformPlayer.Coordinates.ToMap(EntityManager, _transform); var distance = (npcCoords.Position - playerCoords.Position).Length(); diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 7d804c0bed..5db4944600 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -1021,7 +1021,8 @@ highPressureMultiplier: 0.225 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.01 + heatingCoefficient: 0.01 + coolingCoefficient: 0.01 - type: ExplosionResistance damageCoefficient: 0.2 - type: Armor @@ -1035,4 +1036,4 @@ walkModifier: 0.9 sprintModifier: 0.9 - type: HeldSpeedModifier - - type: Unremoveable \ No newline at end of file + - type: Unremoveable diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index cb54490666..54695db82d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -471,7 +471,7 @@ - type: Item heldPrefix: blue - type: PresetIdCard - job: CentralCommandOfficial + job: CentCommOfficial # Sunrise-Edit - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 049ef7caef..020dcde56d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -92,7 +92,7 @@ # wipeVerbPopup: positronic-brain-wiped-device # stopSearchVerbText: positronic-brain-stop-searching-verb-text # stopSearchVerbPopup: positronic-brain-stopped-searching - job: Borg +# job: Borg - type: BlockMovement - type: Examiner # Sunrise-Edit diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index 361b4d298d..bc0909444d 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -54,23 +54,23 @@ # - type: TradeStation # paths: # - /Maps/Shuttles/trading_outpost.yml - # Spawn last - ruins: !type:GridSpawnGroup - hide: true - nameGrid: true - minCount: 2 - maxCount: 2 - stationGrid: false - paths: - - /Maps/Ruins/chunked_tcomms.yml - - /Maps/Ruins/biodome_satellite.yml - - /Maps/Ruins/derelict.yml - - /Maps/Ruins/djstation.yml - - /Maps/Ruins/empty_flagship.yml - - /Maps/Ruins/old_ai_sat.yml - - /Maps/Ruins/syndicate_dropship.yml - - /Maps/Ruins/whiteship_ancient.yml - - /Maps/Ruins/whiteship_bluespacejumper.yml +# Spawn last +# ruins: !type:GridSpawnGroup +# hide: true +# nameGrid: true +# minCount: 2 +# maxCount: 2 +# stationGrid: false +# paths: +# - /Maps/Ruins/chunked_tcomms.yml +# - /Maps/Ruins/biodome_satellite.yml +# - /Maps/Ruins/derelict.yml +# - /Maps/Ruins/djstation.yml +# - /Maps/Ruins/empty_flagship.yml +# - /Maps/Ruins/old_ai_sat.yml +# - /Maps/Ruins/syndicate_dropship.yml +# - /Maps/Ruins/whiteship_ancient.yml +# - /Maps/Ruins/whiteship_bluespacejumper.yml vgroid: !type:DungeonSpawnGroup minimumDistance: 300 maximumDistance: 350 diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index d1e51d5a49..11d054640a 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -489,47 +489,3 @@ type: Add time: 5 refresh: false - -- type: reagent - id: Desoantizyne - name: Desoantizyne - group: Narcotics - desc: Desoantizyne - best drug to everybody, but it is soo.... - physicalDesc: reagent-physical-desc-powdery - flavor: bitter - color: "#BFAC05" - boilingPoint: 255.0 - meltingPoint: 36.0 - metabolisms: - Narcotic: - effects: - - !type:GenericStatusEffect - key: SeeingRainbows - component: SeeingRainbows - type: Add - time: 16 - refresh: false - - !type:MovespeedModifier - walkSpeedModifier: 1.45 - sprintSpeedModifier: 1.5 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 10 - damage: - types: - Poison: 4 # this is added to the base damage of the meth. - Asphyxiation: 1.5 - - !type:Jitter - - !type:PopupMessage - visualType: Medium - messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"] - type: Local - probability: 0.05 - Medicine: - effects: - - !type:ResetNarcolepsy - conditions: - - !type:ReagentThreshold - min: 30 - diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index d7748c8ce4..8b9b732f0f 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -562,7 +562,7 @@ id: Opporozidone minTemp: 400 #Maybe if a method of reducing reagent temp exists one day, this could be -50 reactants: - Cognizine: + Cognizine: amount: 1 Plasma: amount: 2 @@ -664,18 +664,3 @@ products: Haloperidol: 5 -- type: reaction - id: Desoantizyne - reactants: - Potassium: - amount: 4 - Nitrogen: - amount: 1 - Ephedrine: - amount: 5 - Razorium: - amount: 3 - Iodine: 4 - products: - Desoantizyne: 0.75 - diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index c4ecb92c83..0e4463aa36 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -44,7 +44,8 @@ description: department-CentralCommand-description color: "#0c344d" roles: - - CentralCommandOfficial + - CentCommOperator # Sunrise-Edit + - CentCommOfficial # Sunrise-Edit - CBURN - ERTLeader - ERTChaplain @@ -69,7 +70,6 @@ - HeadOfSecurity - ResearchDirector - Quartermaster - - CentralCommandOfficial - CBURN - ERTLeader - ERTChaplain @@ -78,6 +78,7 @@ - ERTSecurity - ERTEngineer - DeathSquad + - CentCommOfficial - NanoTrasenRepresentative #Sunrise-Edit - Adjutant #Sunrise-edit primary: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml index 6b1a3766c1..a3997d35ec 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml @@ -28,7 +28,8 @@ highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.005 + heatingCoefficient: 0.005 + coolingCoefficient: 0.005 - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml index 9470298ea1..0876105233 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -15,7 +15,8 @@ walkModifier: 1.0 sprintModifier: 1.0 - type: TemperatureProtection - coefficient: 0.001 + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 - type: Armor modifiers: coefficients: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_brains.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_brains.yml index 1e64820dab..dec9c8e416 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_brains.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_brains.yml @@ -26,6 +26,7 @@ wipeVerbPopup: boris-wiped-device stopSearchVerbText: boris-stop-searching-verb-text stopSearchVerbPopup: boris-stopped-searching + job: Borg - type: Examiner - type: BorgBrain - type: IntrinsicRadioReceiver @@ -90,6 +91,7 @@ wipeVerbPopup: sofia-wiped-device stopSearchVerbText: sofia-stop-searching-verb-text stopSearchVerbPopup: sofia-stopped-searching + job: Borg - type: Examiner - type: BorgBrain - type: IntrinsicRadioReceiver diff --git a/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml index 431576405a..2d4988d315 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml @@ -9,6 +9,7 @@ amount: 5 Razorium: amount: 3 - Iodine: 4 - products: - Desoantizyne: 0.7 \ No newline at end of file + Iodine: + amount: 4 + products: + Desoantizyne: 0.7 diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index aae8830ccc..6f7be8271a 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -9,16 +9,6 @@ - IAA - Lawyer -- type: department - id: CentralCommand - name: department-CentralCommand - description: department-CentralCommand-description - color: "#048e0f" # Sunrise-Edit - weight: 120 - roles: - - CentCommOperator - primary: false - - type: department # Surnise-Blueshield id: Blueshield name: department-Blueshield