Assorted tweaks to towel trinkets (#39831)

* Added tactical katana + tactical katana shipment (placeholder descriptions)

* Revert "Added tactical katana + tactical katana shipment (placeholder descriptions)"

This reverts commit aa1928be7f4d938df1838943781e63c47a03cc11.

Whoops, committed to master by mistake

* Cleaned up trinket menu

* Fixed dark green towel clothingVisuals color values

* Sorted towels by color

* Undo move of candles

* Sorted towels by actual HSV Hue value

* Remove 10h playtime requirement from white towels

* Removed cheap lighter from PR

diff --git a/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml b/Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
index f5f2053feae9b997224cefe0ec5f394296be9562..3d5840697c036016c38c4ab4c04420488a85590c 100644 (file)
--- 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 9b502bd7d1891bc174ba9b58b40eb7f9626e3ef9..3642300ba7bf7f67283942c71aa86a0c93f9a2ca 100644 (file)
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -329,205 +329,200 @@
 # Towels
 - type: loadout
   id: TowelColorWhite
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:OverallPlaytimeRequirement
-      time: 10h
   storage:
     back:
     - TowelColorWhite
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorSilver
+  id: TowelColorGray
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:OverallPlaytimeRequirement
-      time: 500h
+      !type:RoleTimeRequirement
+      role: JobPassenger
+      time: 100h
   storage:
     back:
-    - TowelColorSilver
+    - TowelColorGray
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorGold
+  id: TowelColorBlack
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:OverallPlaytimeRequirement
-      time: 1000h
+      !type:RoleTimeRequirement
+      role: JobChaplain
+      time: 100h
   storage:
     back:
-    - TowelColorGold
+    - TowelColorBlack
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorLightBrown
+  id: TowelColorRed
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
-      department: Cargo
+      department: Security
       time: 100h
   storage:
     back:
-    - TowelColorLightBrown
+    - TowelColorRed
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorGreen
+  id: TowelColorOrange
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
-      department: Civilian
+      department: Engineering
       time: 100h
   storage:
     back:
-    - TowelColorGreen
+    - TowelColorOrange
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorDarkBlue
+  id: TowelColorLightBrown
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
-      department: Command
+      department: Cargo
       time: 100h
   storage:
     back:
-    - TowelColorDarkBlue
+    - TowelColorLightBrown
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorOrange
+  id: TowelColorYellow
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:DepartmentTimeRequirement
-      department: Engineering
+      !type:RoleTimeRequirement
+      role: JobClown
       time: 100h
   storage:
     back:
-    - TowelColorOrange
+    - TowelColorYellow
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorLightBlue
+  id: TowelColorDarkGreen
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:DepartmentTimeRequirement
-      department: Medical
+      !type:RoleTimeRequirement
+      role: JobLibrarian
       time: 100h
   storage:
     back:
-    - TowelColorLightBlue
+    - TowelColorDarkGreen
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorPurple
+  id: TowelColorGreen
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
-      department: Science
+      department: Civilian
       time: 100h
   storage:
     back:
-    - TowelColorPurple
+    - TowelColorGreen
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorRed
+  id: TowelColorLightBlue
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:DepartmentTimeRequirement
-      department: Security
+      department: Medical
       time: 100h
   storage:
     back:
-    - TowelColorRed
+    - TowelColorLightBlue
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorGray
+  id: TowelColorDarkBlue
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:RoleTimeRequirement
-      role: JobPassenger
+      !type:DepartmentTimeRequirement
+      department: Command
       time: 100h
   storage:
     back:
-    - TowelColorGray
+    - TowelColorDarkBlue
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorBlack
+  id: TowelColorPurple
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:RoleTimeRequirement
-      role: JobChaplain
+      !type:DepartmentTimeRequirement
+      department: Science
       time: 100h
   storage:
     back:
-    - TowelColorBlack
+    - TowelColorPurple
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorDarkGreen
+  id: TowelColorMaroon
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:RoleTimeRequirement
-      role: JobLibrarian
+      role: JobLawyer
       time: 100h
   storage:
     back:
-    - TowelColorDarkGreen
+    - TowelColorMaroon
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorMaroon
+  id: TowelColorMime
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
       !type:RoleTimeRequirement
-      role: JobLawyer
+      role: JobMime
       time: 100h
   storage:
     back:
-    - TowelColorMaroon
+    - TowelColorMime
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorYellow
+  id: TowelColorSilver
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:RoleTimeRequirement
-      role: JobClown
-      time: 100h
+      !type:OverallPlaytimeRequirement
+      time: 500h
   storage:
     back:
-    - TowelColorYellow
+    - TowelColorSilver
   groupBy: "towels"
 
 - type: loadout
-  id: TowelColorMime
+  id: TowelColorGold
   effects:
   - !type:JobRequirementLoadoutEffect
     requirement:
-      !type:RoleTimeRequirement
-      role: JobMime
-      time: 100h
+      !type:OverallPlaytimeRequirement
+      time: 1000h
   storage:
     back:
-    - TowelColorMime
+    - TowelColorGold
   groupBy: "towels"

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 58876e595ab93c427412e912534faf3f473ffb10..185b68ab36260c3646b3779a761da97ee849f40d 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -45,22 +45,22 @@
   - OffsetCaneMime
   - OffsetCaneNT
   - Cane
+  - TowelColorWhite
+  - TowelColorGray
   - TowelColorBlack
-  - TowelColorDarkBlue
+  - TowelColorRed
+  - TowelColorOrange
+  - TowelColorLightBrown
+  - TowelColorYellow
   - TowelColorDarkGreen
-  - TowelColorGold
-  - TowelColorGray
   - TowelColorGreen
   - TowelColorLightBlue
-  - TowelColorLightBrown
+  - TowelColorDarkBlue
+  - TowelColorPurple
   - TowelColorMaroon
   - TowelColorMime
-  - TowelColorOrange
-  - TowelColorPurple
-  - TowelColorRed
   - TowelColorSilver
-  - TowelColorWhite
-  - TowelColorYellow
+  - TowelColorGold
 
 - type: loadoutGroup
   id: Glasses