diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml index f5f2053fea..3d5840697c 100644 --- a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml +++ b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml @@ -387,26 +387,26 @@ - type: Sprite layers: - state: icon - color: "#79CC26" + color: "#639137" - type: Item inhandVisuals: left: - state: inhand-left - color: "#79CC26" + color: "#639137" right: - state: inhand-right - color: "#79CC26" + color: "#639137" - type: Clothing clothingVisuals: head: - state: equipped-HELMET - color: "#79CC26" + color: "#639137" jumpsuit: - state: equipped-INNERCLOTHING - color: "#79CC26" + color: "#639137" belt: - state: equipped-BELT - color: "#79CC26" + color: "#639137" - type: Fiber fiberColor: fibers-green diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 9b502bd7d1..3642300ba7 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -329,131 +329,11 @@ # Towels - type: loadout id: TowelColorWhite - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:OverallPlaytimeRequirement - time: 10h storage: back: - TowelColorWhite groupBy: "towels" -- type: loadout - id: TowelColorSilver - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:OverallPlaytimeRequirement - time: 500h - storage: - back: - - TowelColorSilver - groupBy: "towels" - -- type: loadout - id: TowelColorGold - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:OverallPlaytimeRequirement - time: 1000h - storage: - back: - - TowelColorGold - groupBy: "towels" - -- type: loadout - id: TowelColorLightBrown - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Cargo - time: 100h - storage: - back: - - TowelColorLightBrown - groupBy: "towels" - -- type: loadout - id: TowelColorGreen - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Civilian - time: 100h - storage: - back: - - TowelColorGreen - groupBy: "towels" - -- type: loadout - id: TowelColorDarkBlue - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Command - time: 100h - storage: - back: - - TowelColorDarkBlue - groupBy: "towels" - -- type: loadout - id: TowelColorOrange - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Engineering - time: 100h - storage: - back: - - TowelColorOrange - groupBy: "towels" - -- type: loadout - id: TowelColorLightBlue - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Medical - time: 100h - storage: - back: - - TowelColorLightBlue - groupBy: "towels" - -- type: loadout - id: TowelColorPurple - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Science - time: 100h - storage: - back: - - TowelColorPurple - groupBy: "towels" - -- type: loadout - id: TowelColorRed - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Security - time: 100h - storage: - back: - - TowelColorRed - groupBy: "towels" - - type: loadout id: TowelColorGray effects: @@ -481,29 +361,42 @@ groupBy: "towels" - type: loadout - id: TowelColorDarkGreen + id: TowelColorRed effects: - !type:JobRequirementLoadoutEffect requirement: - !type:RoleTimeRequirement - role: JobLibrarian + !type:DepartmentTimeRequirement + department: Security time: 100h storage: back: - - TowelColorDarkGreen + - TowelColorRed groupBy: "towels" - type: loadout - id: TowelColorMaroon + id: TowelColorOrange effects: - !type:JobRequirementLoadoutEffect requirement: - !type:RoleTimeRequirement - role: JobLawyer + !type:DepartmentTimeRequirement + department: Engineering time: 100h storage: back: - - TowelColorMaroon + - TowelColorOrange + groupBy: "towels" + +- type: loadout + id: TowelColorLightBrown + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Cargo + time: 100h + storage: + back: + - TowelColorLightBrown groupBy: "towels" - type: loadout @@ -519,6 +412,84 @@ - TowelColorYellow groupBy: "towels" +- type: loadout + id: TowelColorDarkGreen + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobLibrarian + time: 100h + storage: + back: + - TowelColorDarkGreen + groupBy: "towels" + +- type: loadout + id: TowelColorGreen + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Civilian + time: 100h + storage: + back: + - TowelColorGreen + groupBy: "towels" + +- type: loadout + id: TowelColorLightBlue + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Medical + time: 100h + storage: + back: + - TowelColorLightBlue + groupBy: "towels" + +- type: loadout + id: TowelColorDarkBlue + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Command + time: 100h + storage: + back: + - TowelColorDarkBlue + groupBy: "towels" + +- type: loadout + id: TowelColorPurple + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Science + time: 100h + storage: + back: + - TowelColorPurple + groupBy: "towels" + +- type: loadout + id: TowelColorMaroon + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobLawyer + time: 100h + storage: + back: + - TowelColorMaroon + groupBy: "towels" + - type: loadout id: TowelColorMime effects: @@ -531,3 +502,27 @@ back: - TowelColorMime groupBy: "towels" + +- type: loadout + id: TowelColorSilver + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:OverallPlaytimeRequirement + time: 500h + storage: + back: + - TowelColorSilver + groupBy: "towels" + +- type: loadout + id: TowelColorGold + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:OverallPlaytimeRequirement + time: 1000h + storage: + back: + - TowelColorGold + groupBy: "towels" diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 58876e595a..185b68ab36 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -45,22 +45,22 @@ - OffsetCaneMime - OffsetCaneNT - Cane - - TowelColorBlack - - TowelColorDarkBlue - - TowelColorDarkGreen - - TowelColorGold + - TowelColorWhite - TowelColorGray + - TowelColorBlack + - TowelColorRed + - TowelColorOrange + - TowelColorLightBrown + - TowelColorYellow + - TowelColorDarkGreen - TowelColorGreen - TowelColorLightBlue - - TowelColorLightBrown + - TowelColorDarkBlue + - TowelColorPurple - TowelColorMaroon - TowelColorMime - - TowelColorOrange - - TowelColorPurple - - TowelColorRed - TowelColorSilver - - TowelColorWhite - - TowelColorYellow + - TowelColorGold - type: loadoutGroup id: Glasses