From 122e6776f5ea87dce657d92e4f3c96439016d468 Mon Sep 17 00:00:00 2001 From: ThereDrD <88589686+ThereDrD0@users.noreply.github.com> Date: Thu, 29 Aug 2024 12:41:20 +0300 Subject: [PATCH] temporary removing most of all loadout timers (#676) --- .../Prototypes/Loadouts/Jobs/Cargo/common.yml | 27 ------------------- .../Loadouts/Jobs/Civilian/clown.yml | 4 +-- .../Loadouts/Jobs/Civilian/janitor.yml | 9 ------- .../Loadouts/Jobs/Civilian/passenger.yml | 12 --------- .../Jobs/Command/head_of_personnel.yml | 2 +- Resources/Prototypes/Loadouts/Jobs/common.yml | 3 --- .../Loadouts/Miscellaneous/glasses.yml | 6 ----- 7 files changed, 3 insertions(+), 60 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml index 932b5ee9a2..0023418d40 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml @@ -13,9 +13,6 @@ - type: itemLoadout # WD id: MercenaryBand equipment: MercenaryBand - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryBand equipment: @@ -24,9 +21,6 @@ - type: itemLoadout # WD id: MercenaryBeret equipment: MercenaryBeret - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryBeret equipment: @@ -47,9 +41,6 @@ - type: itemLoadout # WD id: MercenaryGlasses equipment: MercenaryGlasses - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryGlasses equipment: @@ -60,9 +51,6 @@ - type: itemLoadout # WD id: MercenaryMask equipment: MercenaryMask - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryMask equipment: @@ -71,9 +59,6 @@ - type: itemLoadout # WD id: MercenaryMaskGas equipment: MercenaryMaskGas - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryMaskGas equipment: @@ -84,9 +69,6 @@ - type: itemLoadout # WD id: MercenaryJumpsuit equipment: MercenaryJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryJumpsuit equipment: @@ -97,9 +79,6 @@ - type: itemLoadout # WD id: MercenaryGlovesFingerless equipment: MercenaryGlovesFingerless - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryGlovesFingerless equipment: @@ -110,9 +89,6 @@ - type: itemLoadout # WD id: MercenaryBoots equipment: MercenaryBoots - effects: - - !type:GroupLoadoutEffect - proto: MercenaryLoadoutTimer - type: startingGear id: MercenaryBoots equipment: @@ -131,9 +107,6 @@ - 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/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml index 1f89080c39..ce2926462d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobClown - time: 108000 # 30 hours as clown required to ascend + time: 999999999 # 30 hours as clown required to ascend 108000 - type: loadoutEffectGroup # WD id: MedalClownTimer @@ -15,7 +15,7 @@ requirement: !type:RoleTimeRequirement role: JobClown - time: 36000 # 10 hours + time: 999999999 # 10 hours 36000 # Head - type: itemLoadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index 368d858a16..bc569ba85c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -21,9 +21,6 @@ - type: itemLoadout # WD id: JanitorPlunger equipment: JanitorPlunger - effects: - - !type:GroupLoadoutEffect - proto: TimerJanitorFunnyHeads - type: startingGear id: JanitorPlunger equipment: @@ -32,9 +29,6 @@ - type: itemLoadout # WD id: JanitorBucket equipment: JanitorBucket - effects: - - !type:GroupLoadoutEffect - proto: TimerJanitorFunnyHeads - type: startingGear id: JanitorBucket equipment: @@ -100,9 +94,6 @@ - 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 857dd7bf17..d86fdcdd2d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -12,10 +12,6 @@ - type: itemLoadout id: AssistantFace equipment: GasMask - effects: - - !type:GroupLoadoutEffect - proto: GreyTider - - type: startingGear id: GasMask equipment: @@ -43,10 +39,6 @@ - type: itemLoadout id: AncientJumpsuit equipment: AncientJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: GreyTider - - type: startingGear id: AncientJumpsuit equipment: @@ -84,10 +76,6 @@ - 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 506c8ce58e..b1c04581a9 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: 54000 #15 hrs, special reward for HoP mains + time: 999999999 #15 hrs, special reward for HoP mains 54000 # Jumpsuit - type: itemLoadout diff --git a/Resources/Prototypes/Loadouts/Jobs/common.yml b/Resources/Prototypes/Loadouts/Jobs/common.yml index 84eeb72764..cdf582feb3 100644 --- a/Resources/Prototypes/Loadouts/Jobs/common.yml +++ b/Resources/Prototypes/Loadouts/Jobs/common.yml @@ -155,9 +155,6 @@ - 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 7366152074..2d6640a909 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -32,9 +32,6 @@ - type: itemLoadout # WD id: GlassesJamjar equipment: GlassesJamjar - effects: - - !type:GroupLoadoutEffect - proto: JamjarTimer - type: startingGear id: GlassesJamjar equipment: @@ -44,9 +41,6 @@ - type: itemLoadout # WD id: GlassesJensen equipment: GlassesJensen - effects: - - !type:GroupLoadoutEffect - proto: JensenTimer - type: startingGear id: GlassesJensen equipment: