diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs index a494c25ad4..753dc5fa03 100644 --- a/Content.Server/IoC/ServerContentIoC.cs +++ b/Content.Server/IoC/ServerContentIoC.cs @@ -67,12 +67,14 @@ namespace Content.Server.IoC IoCManager.Register(); IoCManager.Register(); IoCManager.Register(); - IoCManager.Register(); #if FULL_RELEASE + // затерпишь IoCManager.Register(); + IoCManager.Register(); #else IoCManager.Register(); + IoCManager.Register(); #endif // WD-EDIT diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml index 0023418d40..fac8d04558 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml @@ -13,6 +13,9 @@ - type: itemLoadout # WD id: MercenaryBand equipment: MercenaryBand + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryBand equipment: @@ -21,6 +24,9 @@ - type: itemLoadout # WD id: MercenaryBeret equipment: MercenaryBeret + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryBeret equipment: @@ -41,6 +47,9 @@ - type: itemLoadout # WD id: MercenaryGlasses equipment: MercenaryGlasses + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryGlasses equipment: @@ -51,6 +60,9 @@ - type: itemLoadout # WD id: MercenaryMask equipment: MercenaryMask + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryMask equipment: @@ -59,6 +71,9 @@ - type: itemLoadout # WD id: MercenaryMaskGas equipment: MercenaryMaskGas + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryMaskGas equipment: @@ -69,6 +84,9 @@ - type: itemLoadout # WD id: MercenaryJumpsuit equipment: MercenaryJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryJumpsuit equipment: @@ -79,6 +97,9 @@ - type: itemLoadout # WD id: MercenaryGlovesFingerless equipment: MercenaryGlovesFingerless + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryGlovesFingerless equipment: @@ -89,6 +110,9 @@ - type: itemLoadout # WD id: MercenaryBoots equipment: MercenaryBoots + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryBoots equipment: @@ -107,6 +131,9 @@ - type: itemLoadout # WD id: MercenaryBackpack equipment: MercenaryBackpack + effects: + - !type:GroupLoadoutEffect + proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryBackpack equipment: diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index bc569ba85c..2bf6ecadc7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -21,6 +21,9 @@ - type: itemLoadout # WD id: JanitorPlunger equipment: JanitorPlunger + effects: + - !type:GroupLoadoutEffect + proto: TimerJanitorFunnyHeads - type: startingGear id: JanitorPlunger equipment: @@ -29,6 +32,9 @@ - type: itemLoadout # WD id: JanitorBucket equipment: JanitorBucket + effects: + - !type:GroupLoadoutEffect + proto: TimerJanitorFunnyHeads - type: startingGear id: JanitorBucket equipment: @@ -94,6 +100,9 @@ - type: itemLoadout # WD id: JanitorWetFloorSign equipment: JanitorWetFloorSign + effects: + - !type:GroupLoadoutEffect + proto: TimerJanitorFunnyHeads - type: startingGear id: JanitorWetFloorSign equipment: diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index d86fdcdd2d..d1edfa33ff 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -12,6 +12,9 @@ - type: itemLoadout id: AssistantFace equipment: GasMask + effects: + - !type:GroupLoadoutEffect + proto: GreyTider - type: startingGear id: GasMask equipment: @@ -39,6 +42,9 @@ - type: itemLoadout id: AncientJumpsuit equipment: AncientJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: GreyTider - type: startingGear id: AncientJumpsuit equipment: @@ -76,6 +82,9 @@ - type: itemLoadout id: AssistantGloves equipment: FingerlessInsulatedGloves + effects: + - !type:GroupLoadoutEffect + proto: GreyTider - type: startingGear id: FingerlessInsulatedGloves equipment: diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index b1c04581a9..506c8ce58e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 999999999 #15 hrs, special reward for HoP mains 54000 + time: 54000 #15 hrs, special reward for HoP mains # Jumpsuit - type: itemLoadout diff --git a/Resources/Prototypes/Loadouts/Jobs/common.yml b/Resources/Prototypes/Loadouts/Jobs/common.yml index cdf582feb3..514d4c7bac 100644 --- a/Resources/Prototypes/Loadouts/Jobs/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/common.yml @@ -155,6 +155,9 @@ - type: itemLoadout id: CoatSpaceAsshole equipment: CoatSpaceAsshole + effects: + - !type:GroupLoadoutEffect + proto: TimerTrueAssistant - type: startingGear id: CoatSpaceAsshole equipment: diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml index 2d6640a909..b0d8b2a3b0 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -32,6 +32,9 @@ - type: itemLoadout # WD id: GlassesJamjar equipment: GlassesJamjar + effects: + - !type:GroupLoadoutEffect + proto: JamjarTimer - type: startingGear id: GlassesJamjar equipment: @@ -41,6 +44,9 @@ - type: itemLoadout # WD id: GlassesJensen equipment: GlassesJensen + effects: + - !type:GroupLoadoutEffect + proto: JensenTimer - type: startingGear id: GlassesJensen equipment: