Skip to content

Commit

Permalink
Sponsor tweak toys (#858)
Browse files Browse the repository at this point in the history
* Sponsor Fix

* AME AME AME AME

* Fix issue and checks

* state icon:

* Delete comments

---------

Co-authored-by: Dexler <[email protected]>
  • Loading branch information
Surani1 and DexlerXD authored Sep 19, 2024
1 parent 9e2ff2d commit 9af1331
Show file tree
Hide file tree
Showing 12 changed files with 121 additions and 74 deletions.
Binary file added Resources/Audio/SS220/Items/Toys/BUHAAAT_wycc.ogg
Binary file not shown.
Binary file added Resources/Audio/SS220/Items/Toys/BUHAT_wycc.ogg
Binary file not shown.
150 changes: 77 additions & 73 deletions Resources/Prototypes/SS220/Entities/Sponsor/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,79 +149,6 @@
sound:
path: /Audio/Effects/unwrap.ogg

- type: entity
parent: BaseItem
id: SponsorElWycco
suffix: Шлёпа
name: Максон
description: КРИЧИ! КРИЧИ КАК СУЧЕЧКА!
components:
- type: UseDelay
delay: 1.0
- type: MeleeWeapon
wideAnimationRotation: 180
soundHit:
path: /Audio/Items/Toys/weh.ogg
damage:
types:
Blunt: 0
- type: Sprite
sprite: SS220/Objects/Sponsor/elwycco.rsi
layers:
- state: icon
- state: axe
map: ["axe"]
sprite: SS220/Objects/Sponsor/elwycco.rsi
- type: ContainerContainer
containers:
item: !type:ContainerSlot
- type: ItemSlots
slots:
item:
name: Топорик
whitelist:
tags:
- ElWyccoAxe
- type: ContainerFill
containers:
item:
- SponsorElWyccoAxe
- type: EmitSoundOnUse
sound:
path: /Audio/Items/Toys/weh.ogg
- type: EmitSoundOnLand
sound:
path: /Audio/Items/Toys/weh.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/Items/Toys/weh.ogg
- type: PhysicalComposition
materialComposition:
Cloth: 100
- type: StaticPrice
price: 5

- type: entity
parent: BaseKnife
id: SponsorElWyccoAxe
suffix: Шлёпа
name: микро топор
description: Мини топор для мини игрушки.
components:
- type: Tag
tags:
- ElWyccoAxe
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Slash: 0.1
- type: Sprite
sprite: SS220/Objects/Sponsor/elwycco.rsi
state: axe_icon
- type: Item
size: Tiny

# Наборы

- type: entity
Expand Down Expand Up @@ -362,3 +289,80 @@
- id: ClothingSponsorMaidHat
sound:
path: /Audio/Effects/unwrap.ogg

# ss220-fix-WYCC!!!

- type: entity
parent: BasePlushie
id: SponsorElWycc
suffix: Шлёпа
name: Максон
description: КРИЧИ! КРИЧИ КАК СУЧЕЧКА!
components:
- type: Sprite
sprite: SS220/Objects/Sponsor/wycc_overlay.rsi
state: icon
- type: Item
sprite: SS220/Objects/Sponsor/wycc_overlay.rsi
- type: Matchbox
- type: ContainerContainer
containers:
item: !type:ContainerSlot
- type: ItemSlots
slots:
item:
name: Wycco-Axe
whitelist:
tags:
- WyccoAxe
- type: ItemMapper
mapLayers:
wycc_axe:
whitelist:
tags:
- WyccoAxe
sprite: SS220/Objects/Sponsor/wycc_overlay.rsi
- type: ContainerFill
containers:
item:
- SponsorElWyccAxe
- type: Appearance
- type: EmitSoundOnCollide
sound:
path: /Audio/SS220/Items/Toys/BUHAAAT_wycc.ogg
- type: EmitSoundOnUse
sound:
path: /Audio/SS220/Items/Toys/BUHAT_wycc.ogg
- type: EmitSoundOnActivate
sound:
path: /Audio/SS220/Items/Toys/BUHAT_wycc.ogg
- type: UseDelay
delay: 5.0
- type: PhysicalComposition
materialComposition:
Cloth: 100
- type: StaticPrice
price: 5

- type: entity
parent: BaseKnife
id: SponsorElWyccAxe
suffix: Шлёпа
name: мини топорик
description: Мини топор для мини игрушки.
components:
- type: Sprite
sprite: SS220/Objects/Sponsor/wyccaxe.rsi
state: icon
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Stamina: 1
soundHit:
path: /Audio/Items/Toys/mousesqueek.ogg
- type: Item
size: Tiny
- type: Tag
tags:
- WyccoAxe
3 changes: 2 additions & 1 deletion Resources/Prototypes/SS220/RewardGroups/RewardGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@
roundstartTokens: 9
requiredRole: CriticalMassShlopa
rewards:
SponsorElWycco: 1
SponsorElWycc: 1
# SponsorElWycco: 1 пока закомментил, на всякий случай
3 changes: 3 additions & 0 deletions Resources/Prototypes/SS220/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
- type: Tag
id: ElWyccoAxe

- type: Tag
id: WyccoAxe

- type: Tag
id: Meatwheat

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "For SS220 by Meower / Whitly, modifed by Surani",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "wycc_axe"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Resources/Textures/SS220/Objects/Sponsor/wyccaxe.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "For SS220 by Meower / Whitly, modifed by Surani",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 9af1331

Please sign in to comment.