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

fix after upstream

Browse source
This commit is contained in:
Vigers Ray 2025-06-04 14:30:21 +03:00
parent d791eb37bd
commit f7435dd23f
16 changed files with 52 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Content.Server/GameTicking/GameTicker.Spawning.cs
View file

@ -291,7 +291,10 @@ namespace Content.Server.GameTicking
EntityUid? mobMaybe = null;
var spawnPointType = SpawnPointType.Arrivals;
if (jobPrototype.AlwaysUseSpawner || overall < TimeSpan.FromHours(_cfg.GetCVar(SunriseCCVars.ArrivalsMinHours)))
if (jobPrototype.AlwaysUseSpawner ||
overall < TimeSpan.FromHours(_cfg.GetCVar(SunriseCCVars.ArrivalsMinHours)) ||
_cfg.GetCVar(SunriseCCVars.ArrivalsRoundStartSpawn)
)
{
lateJoin = false;
spawnPointType = SpawnPointType.Job;

2
Content.Server/Implants/ChameleonControllerSystem.cs
View file

@ -100,7 +100,7 @@ public sealed class ChameleonControllerSystem : SharedChameleonControllerSystem
return;
defaultRoleLoadout = new RoleLoadout(jobProtoId);
defaultRoleLoadout.SetDefault(profile, null, _proto); // only sets the default if the player has no loadout
defaultRoleLoadout.SetDefault(profile, null, _proto, []); // only sets the default if the player has no loadout
}
private void ChameleonControllerOutfitItemSelected(Entity<ChameleonClothingComponent> ent, ref InventoryRelayedEvent<ChameleonControllerOutfitSelectedEvent> args)

2
Content.Shared/Standing/SharedStandingStateSystem.cs
View file

@ -56,7 +56,7 @@ public abstract class SharedStandingStateSystem : EntitySystem
private static float _fallDeadChance;
public const float FallModifier = 0.4f;
public const float FallModifier = 0.2f;
private const int StandingCollisionLayer = (int) CollisionGroup.LowImpassable;

4
Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs
View file

@ -115,7 +115,7 @@ public sealed class NightVisionDeviceSystem : EntitySystem
_cell.SetDrawEnabled((ent.Owner, draw), false);
}
_appearance.SetData(ent, ToggleableLightVisuals.Enabled, false);
_appearance.SetData(ent, ToggleableVisuals.Enabled, false);
var updVisEv = new NightVisionDeviceUpdateVisualsEvent();
RaiseLocalEvent(ent, ref updVisEv);
@ -146,7 +146,7 @@ public sealed class NightVisionDeviceSystem : EntitySystem
_cell.SetDrawEnabled((ent.Owner, draw), ent.Comp.Activated);
}
_appearance.SetData(ent, ToggleableLightVisuals.Enabled, ent.Comp.Activated);
_appearance.SetData(ent, ToggleableVisuals.Enabled, ent.Comp.Activated);
var updVisEv = new NightVisionDeviceUpdateVisualsEvent();
RaiseLocalEvent(ent, ref updVisEv);

3
Content.Shared/_Sunrise/SunriseCCVars/SunriseCCVars.cs
View file

@ -446,6 +446,9 @@ public sealed partial class SunriseCCVars : CVars
public static readonly CVarDef<int> ArrivalsMinHours =
CVarDef.Create("transithub.arrivals_min_hours", 0, CVar.SERVER | CVar.ARCHIVE);
public static readonly CVarDef<bool> ArrivalsRoundStartSpawn =
CVarDef.Create("transithub.arrivals_round_start_spawn", true, CVar.SERVER | CVar.ARCHIVE);
/*
* Random items-artifacts
*/

3
Resources/ConfigPresets/Build/development.toml
View file

@ -42,3 +42,6 @@ see_own_notes = true
random_characters = true
random_species_weights = ""
ssd_sleep_time = 3600
[transithub]
arrivals_round_start_spawn = false

12
Resources/Prototypes/Entities/Clothing/Head/welding.yml
View file

@ -36,7 +36,7 @@
sprite: Clothing/Head/Welding/welding.rsi
layers:
- state: icon
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
- type: Clothing
sprite: Clothing/Head/Welding/welding.rsi
# Sunrise End
@ -54,8 +54,8 @@
- type: WeldingMask
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
enum.ToggleableVisuals.Enabled:
enum.ToggleableVisuals.Layer:
True: {state: icon}
False: {state: icon-up}
# Sunrise-End
@ -92,7 +92,7 @@
# Sunrise-Start
layers:
- state: icon
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
# Sunrise-End
- type: Clothing
sprite: Clothing/Head/Welding/flame_welding_mask.rsi
@ -114,7 +114,7 @@
# Sunrise-Start
layers:
- state: icon
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
# Sunrise-End
- type: Clothing
sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi
@ -136,7 +136,7 @@
# Sunrise-Start
layers:
- state: icon
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
# Sunrise-End
- type: Clothing
sprite: Clothing/Head/Welding/paintedwelding.rsi

5
Resources/Prototypes/Recipes/Lathes/categories.yml
View file

@ -106,11 +106,6 @@
id: Wood
name: lathe-category-wood
# Science
- type: latheCategory
id: Mech
name: lathe-category-mechs
# Security TechFab
- type: latheCategory
id: Ammo

35
Resources/Prototypes/Roles/Jobs/CentComm/official.yml
View file

@ -1,20 +1,21 @@
- type: job
id: CentralCommandOfficial
name: job-name-centcomoff
description: job-description-centcomoff
playTimeTracker: JobCentralCommandOfficial
setPreference: false
startingGear: CentcomGear
icon: "JobIconNanotrasen"
supervisors: job-supervisors-hos
canBeAntag: false
accessGroups:
- AllAccess
access:
- CentralCommand
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
# Sunrise-Edit: Move to _Sunrise
#- type: job
# id: CentralCommandOfficial
# name: job-name-centcomoff
# description: job-description-centcomoff
# playTimeTracker: JobCentralCommandOfficial
# setPreference: false
# startingGear: CentcomGear
# icon: "JobIconNanotrasen"
# supervisors: job-supervisors-hos
# canBeAntag: false
# accessGroups:
# - AllAccess
# access:
# - CentralCommand
# special:
# - !type:AddImplantSpecial
# implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
- type: startingGear
id: CentcomGear

2
Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml
View file

@ -56,7 +56,7 @@
sprite: _Sunrise/Clothing/Shoes/magboots-atmos.rsi
layers:
- state: icon
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
- type: Clothing
sprite: _Sunrise/Clothing/Shoes/magboots-atmos.rsi
- type: PowerChargerVisuals

2
Resources/Prototypes/_Sunrise/Entities/Objects/Misc/zippos.yml
View file

@ -38,7 +38,7 @@
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleableVisuals.Enabled:
open:
True: { visible: true }
False: { visible: false }

6
Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/defib.yml
View file

@ -9,13 +9,13 @@
layers:
- state: defib
- state: defib-on
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
visible: false
shader: unshaded
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
enum.ToggleableVisuals.Enabled:
enum.ToggleableVisuals.Layer:
True: { visible: true }
False: { visible: false }
- type: Item

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

@ -397,7 +397,7 @@
- state: indwelder_cyborg-on
visible: false
shader: unshaded
map: ["enum.ToggleVisuals.Layer"]
map: ["enum.ToggleableVisuals.Layer"]
- type: Item
size: Small
- type: SolutionContainerManager

8
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml
View file

@ -8,7 +8,7 @@
sprite: _Sunrise/Objects/Weapons/Melee/cane-nt.rsi
layers:
- state: cane-nt
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
- type: Stunbaton
energyPerUse: 25
- type: ItemToggle
@ -56,8 +56,8 @@
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
enum.ToggleableVisuals.Enabled:
enum.ToggleableVisuals.Layer:
True: {state: cane-nt-active}
False: {state: cane-nt}
- type: Riggable
@ -68,4 +68,4 @@
- type: InjectableSolution
solution: battery
- type: DrawableSolution
solution: battery
solution: battery

6
Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml
View file

@ -23,7 +23,7 @@
sprite: _Sunrise/Objects/Weapons/Melee/telebaton.rsi
layers:
- state: telebaton_off
map: [ "enum.ToggleVisuals.Layer" ]
map: [ "enum.ToggleableVisuals.Layer" ]
- type: ItemToggleMeleeWeapon
activatedDamage:
types:
@ -57,8 +57,8 @@
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
enum.ToggleableVisuals.Enabled:
enum.ToggleableVisuals.Layer:
True: {state: telebaton_on}
False: {state: telebaton_off}
- type: StaticPrice

1
Resources/Prototypes/_Sunrise/Entities/Stations/nanotrasen.yml
View file

@ -31,5 +31,6 @@
- BaseStationAllEventsEligible
- BaseStationNanotrasen
- BaseStationDeliveries
- BaseStationTransitHub
components:
- type: Transform