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.

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

Silly Loadouts #217

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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: 1 addition & 0 deletions Resources/Locale/en-US/Floof/loadouts/categories.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
loadout-category-ItemsLewd = Lewd
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/Floof/loadouts/itemgroups.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ character-item-group-LoadoutNeck2 = Civilian Neckwear
character-item-group-LoadoutOuter2 = Civilian Outerwear
character-item-group-LoadoutShoes2 = Civilian Shoes
character-item-group-LoadoutUniformsCivilian2 = Civilian Uniforms
character-item-group-LoadoutFun = Fun
character-item-group-LoadoutLewd = Lewd
46 changes: 46 additions & 0 deletions Resources/Prototypes/Floof/CharacterItemGroups/funGroup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- type: characterItemGroup
id: LoadoutFun
items:
- type: loadout
id: LoadoutItemLeashBasic
- type: loadout
id: LoadoutItemLeashShort

# If you are ever going to add more: open regex101; in list mode, find "id: (.+)", replace with "- type: loadout\n id: $1\n", paste the result here
- type: characterItemGroup
id: LoadoutLewd
items:
- type: loadout
id: LoadoutItemLewdWand
- type: loadout
id: LoadoutItemLewdVibeGreen
- type: loadout
id: LoadoutItemLewdVibeTeal
- type: loadout
id: LoadoutItemLewdVibePink
- type: loadout
id: LoadoutItemLewdVibeRed
- type: loadout
id: LoadoutItemLewdVibeYellow
- type: loadout
id: LoadoutItemLewdFleshlightGreen
- type: loadout
id: LoadoutItemLewdFleshlightTeal
- type: loadout
id: LoadoutItemLewdFleshlightPink
- type: loadout
id: LoadoutItemLewdFleshlightRed
- type: loadout
id: LoadoutItemLewdFleshlightYellow
- type: loadout
id: LoadoutItemWhipPink
- type: loadout
id: LoadoutItemWhipTeal
- type: loadout
id: LoadoutItemWhipPinkCrotch
- type: loadout
id: LoadoutItemWhipTealCrotch
- type: loadout
id: LoadoutItemSpankPinkPaddle
- type: loadout
id: LoadoutItemSpankTealPaddle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
detachDelay: 4
selfDetachDelay: 10

# TODO this should be named LeashShort...
- type: entity
id: ShortLeash
parent: BaseLeash
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# TODO make this a subcategory of items when EE splits items into subcategories
- type: loadoutCategory
id: ItemsLewd
root: true
31 changes: 31 additions & 0 deletions Resources/Prototypes/Floof/Loadouts/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,34 @@
cost: 0
items:
- ClothingBeltSuspenders

- type: loadout
id: LoadoutItemRemoteSignaller
category: Items
cost: 1
items:
- RemoteSignaller

# Leashes
- type: loadout
id: LoadoutItemLeashBasic
category: Items
cost: 2
exclusive: true
items:
- LeashBasic
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutFun

- type: loadout
id: LoadoutItemLeashShort
category: Items
cost: 2
exclusive: true
items:
- ShortLeash
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutFun

181 changes: 181 additions & 0 deletions Resources/Prototypes/Floof/Loadouts/itemsLewd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
# Note: only explicitly lewd items go into this category.
# Items with ambiguous uses like leashes should go into Items

# Wands
- type: loadout
id: LoadoutItemLewdWand
category: ItemsLewd
cost: 2
exclusive: true
items:
- LewdWand
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdVibeGreen
category: ItemsLewd
cost: 2
exclusive: true
items:
- LewdVibeGreen
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdVibeTeal
category: ItemsLewd
cost: 2
exclusive: true
items:
- LewdVibeTeal
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdVibePink
category: ItemsLewd
cost: 2
exclusive: true
items:
- LewdVibePink
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdVibeRed
category: ItemsLewd
cost: 2
exclusive: true
items:
- LewdVibeRed
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdVibeYellow
category: ItemsLewd
cost: 2
exclusive: true
items:
- LewdVibeYellow
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

# Fleshlights
- type: loadout
id: LoadoutItemLewdFleshlightGreen
category: ItemsLewd
cost: 0
Mnemotechnician marked this conversation as resolved.
Show resolved Hide resolved
items:
- LewdFleshlightGreen
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdFleshlightTeal
category: ItemsLewd
cost: 2
items:
- LewdFleshlightTeal
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdFleshlightPink
category: ItemsLewd
cost: 2
items:
- LewdFleshlightPink
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdFleshlightRed
category: ItemsLewd
cost: 2
items:
- LewdFleshlightRed
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemLewdFleshlightYellow
category: ItemsLewd
cost: 2
items:
- LewdFleshlightYellow
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

# Whips
- type: loadout
id: LoadoutItemWhipPink
category: ItemsLewd
cost: 2
items:
- WhipPink
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemWhipTeal
category: ItemsLewd
cost: 2
items:
- WhipTeal
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemWhipPinkCrotch
category: ItemsLewd
cost: 2
items:
- WhipPinkCrotch
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemWhipTealCrotch
category: ItemsLewd
cost: 2
items:
- WhipTealCrotch
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemSpankPinkPaddle
category: ItemsLewd
cost: 2
items:
- SpankPinkPaddle
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd

- type: loadout
id: LoadoutItemSpankTealPaddle
category: ItemsLewd
cost: 2
items:
- SpankTealPaddle
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutLewd
11 changes: 11 additions & 0 deletions Resources/Prototypes/Floof/Loadouts/neck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,14 @@
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck2

- type: loadout
id: LoadoutItemsNeckShockCollar
category: Neck
cost: 1
exclusive: true
items:
- ShockCollar
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutNeck2
Loading