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

Janidrobe has once again maiden outfits. #648

Merged
merged 4 commits into from
Jan 7, 2024
Merged

Janidrobe has once again maiden outfits. #648

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e11e05
Janidrobe has once again maiden outfits.
Adrian16199 Jan 3, 2024
4c41d13
a small update since phil did give a good point
Adrian16199 Jan 4, 2024
50b51a1
Merge branch 'master' into maiden_outfits
Adrian16199 Jan 4, 2024
b654ada
quick fix!
Adrian16199 Jan 7, 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
9 changes: 6 additions & 3 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
ClothingOuterWinterJani: 2
ClothingNeckScarfStripedPurple: 3
ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots

emaggedInventory:
ClothingUniformJumpskirtJanimaid: 2
ClothingUniformJumpskirtJanimaid: 2 # Delta V: the maiden outfits no longer require emagging.
ClothingUniformJumpskirtJanimaidmini: 1

emaggedInventory: # Delta V: tactical maid outfit set is now the emagg reward.
ClothingHandsTacticalMaidGloves: 1
ClothingUniformJumpskirtTacticalMaid: 1
ClothingHeadHatTacticalMaidHeadband: 1
Colin-Tel marked this conversation as resolved.
Show resolved Hide resolved
Loading