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

фикс линтера #653

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
mayTransfer: true
whitelist:
tags:
- ArtilleryGrenade #Sunrise-edit
- ArtilleryShell #Sunrise-edit
capacity: 5
soundRack:
path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,9 @@
- BoxShotgunUranium
- BoxShellTranquilizer
- ExplosivePayload
- GrenadeBlast
- GrenadeEMP
- GrenadeFlash
- ShellBlastArtillery #Sunrise-edit
- ShellEMPArtillery #Sunrise-edit
- ShellFlashArtillery #Sunrise-edit
- HoloprojectorSecurity
- MagazineBoxLightRifleIncendiary
- MagazineBoxLightRifleUranium
Expand Down Expand Up @@ -864,9 +864,9 @@
- ClothingBackpackElectropack
- ExplosivePayload
- FlashPayload
- GrenadeBlast
- GrenadeEMP
- GrenadeFlash
- ShellBlastArtillery #Sunrise-edit
- ShellEMPArtillery #Sunrise-edit
- ShellFlashArtillery #Sunrise-edit
- HoloprojectorSecurity
- MagazineBoxLightRifleIncendiary
- MagazineBoxLightRifleUranium
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3006,7 +3006,7 @@
- type: listing
id: UplinkSunrisePlayerBorgGeneric
name: uplink-sunrise-player-borg-generic-name
productEntity: PlayerBorgGeneric
productEntity: BorgChassisGeneric
cost:
Suntick: 100
categories:
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/borg_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
- Supply
- Science

addComponent:
addComponents:
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepCyborgSpider
Expand Down Expand Up @@ -133,7 +133,7 @@
- Science
- Service

addComponent:
addComponents:
- type: FootstepModifier
footstepSoundCollection:
path: /Audio/Effects/Fluids/watersplash.ogg
Expand Down Expand Up @@ -327,7 +327,7 @@
petFailureString: petting-failure-peace-cyborg


# Peace borg
# Clown borg
- type: borgType
id: clown

Expand Down
Loading