Skip to content

fix rocket magazine loading #1570

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

Closed
mika10095 wants to merge 1 commit into from
Closed

fix rocket magazine loading #1570

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
6 changes: 5 additions & 1 deletion Resources/Prototypes/_Crescent/Entities/Turrets/Missile/magazines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: Magazine48mmRocket
name: 48mm loading box
description: A munitions drum designed to ease loading of 48mm rocket systems. Comes 6 rockets to a box.
parent: BaseItem
parent: BaseAmmoProvider
components:
- type: BallisticAmmoProvider
mayTransfer: true
Expand Down Expand Up @@ -60,6 +60,7 @@
parent: Magazine48mmRocket
components:
- type: BallisticAmmoProvider
fillDelay: 1
whitelist:
tags:
- CartridgeAzimuth
Expand All @@ -72,6 +73,7 @@
parent: Magazine48mmRocket
components:
- type: BallisticAmmoProvider
fillDelay: 1
whitelist:
tags:
- CartridgeAzimuth
Expand All @@ -91,6 +93,7 @@
parent: Magazine48mmRocket
components:
- type: BallisticAmmoProvider
fillDelay: 1
whitelist:
tags:
- CartridgeAzimuth
Expand All @@ -110,6 +113,7 @@
parent: Magazine48mmRocket
components:
- type: BallisticAmmoProvider
fillDelay: 1
whitelist:
tags:
- CartridgeAzimuth
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/_Crescent/Entities/Turrets/Missile/turrets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
- type: BallisticAmmoProvider
cycleable: false
capacity: 12
fillWithDoAfter: true
fillDelay: 0.5
proto: Cartridge48mmRocket
whitelist:
tags:
Expand Down Expand Up @@ -90,8 +88,6 @@
- type: BallisticAmmoProvider
cycleable: false
capacity: 18
fillWithDoAfter: true
fillDelay: 1
proto: Cartridge48mmRocket
whitelist:
tags:
Expand Down Expand Up @@ -139,8 +135,6 @@
- type: BallisticAmmoProvider
cycleable: false
capacity: 6
fillWithDoAfter: true
fillDelay: 1
proto: Cartridge60mmRocket
whitelist:
tags:
Expand Down Expand Up @@ -186,8 +180,6 @@
- type: BallisticAmmoProvider
cycleable: false
capacity: 6
fillWithDoAfter: true
fillDelay: 1
proto: Cartridge60mmRocket
whitelist:
tags:
Expand Down Expand Up @@ -230,8 +222,6 @@
- type: BallisticAmmoProvider
cycleable: false
capacity: 6
fillWithDoAfter: true
fillDelay: 1
proto: Cartridge60mmRocket
whitelist:
tags:
Expand Down
Loading