Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove chemmaster flatpack from bartender prestige gear #1163

Merged
merged 2 commits into from
Jan 2, 2025
Merged

Remove chemmaster flatpack from bartender prestige gear #1163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1b01d
remove mixologist qualification
DinnerCalzone Dec 30, 2024
c7efafd
keep chemmaster flatpack prototype
DinnerCalzone Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Resources/Locale/en-US/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 1 addition & 24 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -21,6 +7,7 @@
!type:RoleTimeRequirement
role: JobBartender
time: 187200 #52 hrs (1 hour per week for 1 year)

# Head
- type: loadout
id: BartenderHead
Expand Down Expand Up @@ -83,13 +70,3 @@
proto: SeniorBartender
equipment:
id: SeniorBartenderPDA

# Trinket
- type: loadout
id: ChemMasterFlatpack
effects:
- !type:GroupLoadoutEffect
proto: Mixologist
storage:
back:
- ChemMasterFlatpack
7 changes: 0 additions & 7 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
- BartenderPDA
- Survival
- Trinkets
- Mixologist
- GroupSpeciesBreathTool
- GroupTankHarnessWithOuterwear
- GroupBreathToolDecapoid # imp special
Expand Down
Loading