diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 08cce1e2b9d5..da8daff5e082 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -57,7 +57,6 @@ loadout-group-bartender-neck = Bartender neck loadout-group-bartender-outerclothing = Bartender outer clothing loadout-group-bartender-shoes = Bartender shoes loadout-group-bartender-id = Bartender ID -loadout-group-bartender-mixologist = Mixologist Qualification loadout-group-chef-head = Chef head loadout-group-chef-mask = Chef mask diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index 79699fe6c631..642b30787339 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -1,17 +1,3 @@ -# "Mixologist" Time req -- type: loadoutEffectGroup - id: Mixologist - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobBartender - time: 36000 #10 hrs - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Medical - time: 36000 # 10 hrs # Senior times - type: loadoutEffectGroup id: SeniorBartender @@ -21,6 +7,7 @@ !type:RoleTimeRequirement role: JobBartender time: 187200 #52 hrs (1 hour per week for 1 year) + # Head - type: loadout id: BartenderHead @@ -83,13 +70,3 @@ proto: SeniorBartender equipment: id: SeniorBartenderPDA - - # Trinket -- type: loadout - id: ChemMasterFlatpack - effects: - - !type:GroupLoadoutEffect - proto: Mixologist - storage: - back: - - ChemMasterFlatpack diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 0c6a5d32e4d1..be8790e7dab4 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -343,13 +343,6 @@ - BartenderPDA - SeniorBartenderPDA -- type: loadoutGroup - id: Mixologist - name: loadout-group-bartender-mixologist - minLimit: 0 - loadouts: - - ChemMasterFlatpack - - type: loadoutGroup id: ChefHead name: loadout-group-chef-head diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 113e46be2e94..ce2adc77a980 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -75,7 +75,6 @@ - BartenderPDA - Survival - Trinkets - - Mixologist - GroupSpeciesBreathTool - GroupTankHarnessWithOuterwear - GroupBreathToolDecapoid # imp special