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

Анальные пробки ввиде хвостов #171

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Анальные пробки ввиде хвостов #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_lust/entities/erp/toys/toys.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ ent-ERPPlug3 = { ent-ERPPlug1 }
.desc = { ent-ERPPlug1.desc }
ent-ERPPlug4 = { ent-ERPPlug1 }
.desc = { ent-ERPPlug1.desc }
ent-ERPFoxTailPlug = лисий хвост
.desc = Время для ролевых игр!
ent-ERPCatTailPlug = кошачий хвост
.desc = Мурр!
2 changes: 2 additions & 0 deletions Resources/Prototypes/_Lust/Catalog/VendingMachines/Inventories/kinkmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
ClothingShoesSchoolWhite: 2
ClothingUniformJumpsuitLoona: 3
PlugBox: 3
ERPCatTailPlug: 3
ERPFoxTailPlug: 3
ERPVibroStick: 3
ERPVibroEgg: 3
ERPStrapOn: 3
Expand Down
40 changes: 40 additions & 0 deletions Resources/Prototypes/_Lust/Entities/ERP/Toys/toys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,46 @@
size: Tiny
sprite: _Lust/ERP/Toys/plug.rsi

- type: entity
parent: [BaseItem]
id: ERPFoxTailPlug
name: fox tail plug
description: Time to some roleplaying.
components:
- type: Sprite
sprite: _Lust/ERP/Toys/fox_tail.rsi
state: icon
scale: 0.9,0.9
- type: Item
size: Normal
- type: Clothing
sprite: _Lust/ERP/Toys/fox_tail.rsi
slots:
- PLUG
quickEquip: true
equipDelay: 4
unequipDelay: 4

- type: entity
parent: [BaseItem]
id: ERPCatTailPlug
name: cat tail plug
description: Murr!
components:
- type: Sprite
sprite: _Lust/ERP/Toys/cat_tail.rsi
state: icon
scale: 0.9,0.9
- type: Item
size: Normal
- type: Clothing
sprite: _Lust/ERP/Toys/cat_tail.rsi
slots:
- PLUG
quickEquip: true
equipDelay: 4
unequipDelay: 4


- type: soundCollection
id: Whips
Expand Down
Binary file added Resources/Textures/_Lust/ERP/Toys/cat_tail.rsi/equipped-PLUG.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Lust/ERP/Toys/cat_tail.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/_Lust/ERP/Toys/cat_tail.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by discord @kanopus7 for Lust Station",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-PLUG",
"directions": 4
}
]
}
Binary file added Resources/Textures/_Lust/ERP/Toys/fox_tail.rsi/equipped-PLUG.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_Lust/ERP/Toys/fox_tail.rsi/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/_Lust/ERP/Toys/fox_tail.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by discord @kanopus7 for Lust Station",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-PLUG",
"directions": 4
}
]
}
Loading