From 56ab825fcac541e528ceede329b6f58e11f6e10b Mon Sep 17 00:00:00 2001
From: RedBurningPhoenix <Warete4@gmail.com>
Date: Mon, 26 Aug 2024 20:55:17 +0500
Subject: [PATCH] rework

---
 Resources/Locale/en-US/job/job-names.ftl      |  4 +++
 .../Entities/Clothing/Uniforms/jumpskirts.yml | 33 -------------------
 .../Prototypes/Roles/Jobs/Civilian/bomzh.yml  | 17 ++--------
 .../Prototypes/Roles/Jobs/Command/maid.yml    | 25 +++-----------
 4 files changed, 10 insertions(+), 69 deletions(-)

diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index 19d2db9451..1eac1b7363 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -47,6 +47,8 @@ job-name-ertjanitor = ERT Janitor
 job-name-boxer = Boxer
 job-name-zookeeper = Zookeeper
 job-name-visitor = Visitor
+job-name-maid = Maid
+job-name-bomzh = Homeless
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
@@ -101,3 +103,5 @@ JobTechnicalAssistant = Technical Assistant
 JobVisitor = Visitor
 JobWarden = Warden
 JobZookeeper = Zookeeper
+JobMaid = Maid
+JobBomzh = Homeless
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index f6e1c9b787..566d72867a 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -770,28 +770,6 @@
 
 
 #WHITE START
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtInspector
-  name: inspector's informal jumpskirt
-  description: Informal inspector's outfit. Relax, everyone already knows what you wear under your thin shirt and skirt...
-  components:
-    - type: Sprite
-      sprite: Clothing/Uniforms/Jumpskirt/inspector.rsi
-    - type: Clothing
-      sprite: Clothing/Uniforms/Jumpskirt/inspector.rsi
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtInspectorFormal
-  name: inspector's informal jumpskirt
-  description: Shirt, vest, short skirt and a bright red tie. This is a set of strict elegant official uniform of possibly the most terrifying person on the station - the inspector. The main thing is that you can't see the stockings under the skirt...
-  components:
-    - type: Sprite
-      sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi
-    - type: Clothing
-      sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi
-
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtMaid
@@ -815,14 +793,3 @@
     sprite: White/Clothing/Uniforms/Jumpskirt/maidmini.rsi
 
 #WHITE END
-
-- type: entity
-  parent: ClothingUniformSkirtBase
-  id: ClothingUniformJumpskirtMusician
-  name: musician's skirt
-  description: A fancy skirt for the musically inclined.  Perfect for any lounge act!
-  components:
-  - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/musician.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/musician.rsi
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml
index eaf82401c4..95759a3845 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml
@@ -4,25 +4,12 @@
   description: job-description-bomzh
   playTimeTracker: JobBomzh
   requirements:
-  - !type:DepartmentTimeRequirement
+  - !type:CharacterDepartmentTimeRequirement
     department: Civilian
-    time: 72000 # 20 ch
-  - !type:AgeRequirement
-    requiredAge: 60
-  - !type:GenderRequirement
-    requiredGenders:
-    - Male
-  - !type:SexRequirement
-    requiredSex:
-    - Male
-  - !type:SpeciesRequirement
-    species:
-    - Human
+    min: 72000 # 20 ch
   weight: 20
   icon: "JobIconBomzh"
   supervisors: job-supervisors-hop
-  whitelistedSpecies:
-  - Human
   canBeAntag: true
   accessGroups:
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Command/maid.yml b/Resources/Prototypes/Roles/Jobs/Command/maid.yml
index df925c0fca..608a9ff16a 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/maid.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/maid.yml
@@ -4,32 +4,15 @@
   description: job-description-maid
   playTimeTracker: JobMaid
   requirements:
-  - !type:DepartmentTimeRequirement
+  - !type:CharacterDepartmentTimeRequirement
     department: Medical
-    time: 72000 # 20 ch
-  - !type:DepartmentTimeRequirement
+    min: 72000 # 20 ch
+  - !type:CharacterDepartmentTimeRequirement
     department: Command
-    time: 72000 # 20 ch
-  - !type:AgeRequirement
-    requiredAge: 20
-  - !type:GenderRequirement
-    requiredGenders:
-    - Female
-  - !type:SexRequirement
-    requiredSex:
-    - Female
-  - !type:SpeciesRequirement
-    species:
-    - Human
-    - Felinid
-    - Harpy
+    min: 72000 # 20 ch
   weight: 20
   icon: "JobIconMaid"
   supervisors: job-supervisors-hop
-  whitelistedSpecies:
-  - Human
-  - Felinid
-  - Harpy
   canBeAntag: false
   accessGroups:
   - Maintenance