This repository has been archived by the owner on Dec 30, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 49
Cargo Armory Parkifying #231
Open
LovelyLophi
wants to merge
2
commits into
Simple-Station:master
Choose a base branch
from
LovelyLophi:cargo_crates_expanded
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_armory.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| - type: cargoProduct | ||
| id: ArmoryPv3Pistol | ||
| icon: | ||
| sprite: SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi | ||
| state: icon | ||
| product: CratePV3Pistol | ||
| cost: 6000 | ||
| category: Armory | ||
| group: market | ||
|
|
||
| - type: cargoProduct | ||
| id: ArmoryPv3Smg | ||
| icon: | ||
| sprite: SimpleStation14/Objects/Weapons/Guns/SMGs/pv3compact.rsi | ||
| state: icon | ||
| product: CratePV3Smg | ||
| cost: 10000 | ||
| category: Armory | ||
| group: market | ||
|
|
||
| - type: cargoProduct | ||
| id: ArmoryK12Pistol | ||
| icon: | ||
| sprite: SimpleStation14/Objects/Weapons/Guns/Pistols/k12mini.rsi | ||
| state: icon | ||
| product: CrateK12Pistol | ||
| cost: 4000 | ||
| category: Armory | ||
| group: market | ||
|
|
||
| - type: cargoProduct | ||
| id: ArmoryK12Smg | ||
| icon: | ||
| sprite: SimpleStation14/Objects/Weapons/Guns/Smgs/k12compact.rsi | ||
| state: icon | ||
| product: CrateK12Smg | ||
| cost: 8000 | ||
| category: Armory | ||
| group: market | ||
|
|
||
| - type: cargoProduct | ||
| id: ArmoryMilitia | ||
| icon: | ||
| sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi | ||
| state: base | ||
| product: CrateMilitia | ||
| cost: 6000 | ||
| category: Armory | ||
| group: market |
9 changes: 9 additions & 0 deletions
9
Resources/Prototypes/SimpleStation14/Catalog/Cargo/cargo_engineering.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| - type: cargoProduct | ||
| id: EngineeringPortableGenerator | ||
| icon: | ||
| sprite: Structures/Power/power.rsi | ||
| state: generator | ||
| product: CrateEngineeringPortableGenerator | ||
| cost: 1000 | ||
| category: Engineering | ||
| group: market |
82 changes: 82 additions & 0 deletions
82
Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/armory.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| - type: entity | ||
| id: CratePV3Pistol | ||
| parent: CrateWeaponSecure | ||
| name: PV-3 Mini Crate | ||
| description: "A crate containing three PV-3 Mini energy Personal Defense Weapons" | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: WeaponLaserPv3Mini | ||
| - id: WeaponLaserPv3Mini | ||
| - id: WeaponLaserPv3Mini | ||
|
|
||
| - type: entity | ||
| id: CratePV3Smg | ||
| parent: CrateWeaponSecure | ||
| name: PV-3 Compact Crate | ||
| description: "A crate containing three PV-3 Compact Energy Assault Weapons" | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: WeaponLaserPv3Compact | ||
| - id: WeaponLaserPv3Compact | ||
| - id: WeaponLaserPv3Compact | ||
|
|
||
| - type: entity | ||
| id: CrateK12Pistol | ||
| parent: CrateWeaponSecure | ||
| name: K12 Mini Crate | ||
| description: "A crate containing two K12 Mini Ballistic Personal Defense Weapons" | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: WeaponPistolK12Mini | ||
| - id: WeaponPistolK12Mini | ||
| - id: MagazinePistol | ||
| - id: MagazinePistol | ||
| - id: MagazinePistol | ||
| - id: MagazinePistol | ||
|
|
||
| - type: entity | ||
| id: CrateK12Smg | ||
| parent: CrateWeaponSecure | ||
| name: K12 Compact Crate | ||
| description: "A crate containing two K12 Compact Ballistic Assault Weapons" | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: WeaponSubMachineGunK12Compact | ||
| - id: WeaponSubMachineGunK12Compact | ||
| - id: MagazinePistolSubMachineGun | ||
| - id: MagazinePistolSubMachineGun | ||
| - id: MagazinePistolSubMachineGun | ||
| - id: MagazinePistolSubMachineGun | ||
|
|
||
| - type: entity | ||
| id: CrateMilitia | ||
| parent: CrateWeaponSecure | ||
| name: Militia Crate | ||
| description: "A crate containing four Mark 1 rifles, four armor vests, four berets, and eight stripper clips of .30 rifle" | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: WeaponSniperGrand | ||
| - id: WeaponSniperGrand | ||
| - id: WeaponSniperGrand | ||
| - id: WeaponSniperGrand | ||
| - id: SpeedLoaderLightRifle | ||
| - id: SpeedLoaderLightRifle | ||
| - id: SpeedLoaderLightRifle | ||
| - id: SpeedLoaderLightRifle | ||
| - id: SpeedLoaderLightRifle | ||
| - id: SpeedLoaderLightRifle | ||
| - id: SpeedLoaderLightRifle | ||
| - id: SpeedLoaderLightRifle | ||
| - id: ClothingHeadHatBeret | ||
| - id: ClothingHeadHatBeret | ||
| - id: ClothingHeadHatBeret | ||
| - id: ClothingHeadHatBeret | ||
| - id: ClothingOuterArmorBasic | ||
| - id: ClothingOuterArmorBasic | ||
| - id: ClothingOuterArmorBasic | ||
| - id: ClothingOuterArmorBasic | ||
9 changes: 9 additions & 0 deletions
9
Resources/Prototypes/SimpleStation14/Catalog/Fills/Crates/engines.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| - type: entity | ||
| id: CrateEngineeringPortableGenerator | ||
| parent: CrateEngineering | ||
| name: Portable Generator Crate | ||
| description: "A crate containing a portable generator" | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: GeneratorBasic |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just since they're the Compact SMG versions of the weapons, and not the (to be done?) full size Rifle versions, perhaps assault isn't the best choice of words?