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

Jump to bottom

Рапира синдиката #517

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Рапира синдиката #517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b106826
rapirasyndie
Focstor Oct 17, 2024
94f8afa
fix
Focstor Oct 18, 2024
a2776ac
fix2
Focstor Oct 18, 2024
6a6bd6e
fix3
Focstor Oct 18, 2024
8070608
fix4
Focstor Oct 19, 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
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ ent-ClothingBeltSheathSyndicateFilled = {ent-ClothingBeltSheathSyndicate}
.desc = { ent-ClothingBeltSheathSyndicate.desc }
ent-ClothingBeltSheathSyndicate = ножны для рапиры
.desc = Зловещие тонкие ножны, подходящие для рапиры.
ent-BeltSheathSyndieFilledBox = обёрнутая рапира синдиката
.desc = Разверните.
17 changes: 17 additions & 0 deletions Resources/Prototypes/_Sunrise/Catalog/Fills/Items/belt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,20 @@
containers:
item:
- SyndicateRapier

- type: entity
parent: [BaseItem, BaseSyndicateContraband]
id: BeltSheathSyndieFilledBox
name: the Wrapped Rapier of the Syndicate
description: Unwrap.
components:
- type: Item
size: Ginormous
- type: Sprite
sprite: _Sunrise/Objects/Storage/sheath-rapier-gift.rsi
state: sheath-rapier-gift
- type: SpawnItemsOnUse
items:
- id: ClothingBeltSheathSyndicateFilled
sound:
path: /Audio/Effects/unwrap.ogg
4 changes: 2 additions & 2 deletions Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,8 @@
id: UplinkSyndicateRapier
name: uplink-syndicate-rapier-name
description: uplink-syndicate-rapier-desc
icon: { sprite: /Textures/_SunRise/Clothing/Belt/syndie_sheath.rsi, state: sheath-rapier }
productEntity: ClothingBeltSheathSyndicateFilled
icon: { sprite: _Sunrise/Clothing/Belt/syndie_sheath.rsi, state: sheath-rapier }
productEntity: BeltSheathSyndieFilledBox
discountCategory: rareDiscounts
discountDownTo:
Telecrystal: 5
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/sword.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
spread: 90
- type: Item
sprite: _Sunrise/Objects/Weapons/Melee/syndicate_rapier.rsi
- type: DisarmMalus
weight: 0.0002
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Епт, верни, я имел ввиду параметр "weight"

- type: Tag
tags:
- SyndicateRapier
1 change: 1 addition & 0 deletions Resources/Prototypes/_Sunrise/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,4 @@

- type: Tag
id: SyndicateRapier

14 changes: 14 additions & 0 deletions Resources/Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Спизжено из SS13 Paradise",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "sheath-rapier-gift"
}
]
}
Binary file added ...Textures/_Sunrise/Objects/Storage/sheath-rapier-gift.rsi/sheath-rapier-gift.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.
Loading