rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

фиксы апстрима

Browse source
This commit is contained in:
VigersRay 2024-09-16 13:13:35 +03:00
parent aa38c32b65
commit 3bbae85466
18 changed files with 49 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Server/Chat/Systems/ChatSystem.cs
View file

@ -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;

4
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
View file

@ -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),

3
Content.Server/Zombies/ZombieSystem.cs
View file

@ -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)

5
Content.Server/_Sunrise/Carrying/CarryingSystem.cs
View file

@ -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<CarryingComponent>(carrier);
@ -274,7 +273,7 @@ namespace Content.Server._Sunrise.Carrying
}
public void DropCarried(EntityUid carrier, EntityUid carried)
{
{
RemComp<CarryingComponent>(carrier); // get rid of this first so we don't recusrively fire that event
RemComp<CarryingSlowdownComponent>(carrier);
RemComp<BeingCarriedComponent>(carried);

5
Content.Server/_Sunrise/Fugitive/FugitiveSpawner.cs
View file

@ -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<FugitiveCountdownComponent>(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<MapGridComponent>(xform.GridUid, out var map))
return;
var currentTile = map.GetTileRef(xform.Coordinates);
_tile.PryTile(currentTile);

5
Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
View file

@ -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();

5
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
View file

@ -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
- type: Unremoveable

2
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
View file

@ -471,7 +471,7 @@
- type: Item
heldPrefix: blue
- type: PresetIdCard
job: CentralCommandOfficial
job: CentCommOfficial # Sunrise-Edit
- type: entity
parent: IDCardStandard

2
Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
View file

@ -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

34
Resources/Prototypes/Entities/Stations/base.yml
View file

@ -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

44
Resources/Prototypes/Reagents/narcotics.yml
View file

@ -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

17
Resources/Prototypes/Recipes/Reactions/medicine.yml
View file

@ -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

5
Resources/Prototypes/Roles/Jobs/departments.yml
View file

@ -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

3
Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml
View file

@ -28,7 +28,8 @@
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.005
heatingCoefficient: 0.005
coolingCoefficient: 0.005
- type: Armor
modifiers:
coefficients:

3
Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml
View file

@ -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:

2
Resources/Prototypes/_Sunrise/Entities/Objects/Specific/borg_brains.yml
View file

@ -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

7
Resources/Prototypes/_Sunrise/Recipes/Reactions/medicine.yml
View file

@ -9,6 +9,7 @@
amount: 5
Razorium:
amount: 3
Iodine: 4
products:
Desoantizyne: 0.7
Iodine:
amount: 4
products:
Desoantizyne: 0.7

10
Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
View file

@ -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