Skip to content

Commit

Permalink
RSC rifle crate as cargo purchase (space-wizards#189)
Browse files Browse the repository at this point in the history
* added RSC rifle crate as cargo purchase

* replaced placeholder RSC texture with one supplied by thesaladmancer

* added stripper clip recipe to relevant lathes

* fixed test failures

* clarified access requirements in description
  • Loading branch information
Unisol authored Nov 20, 2024
1 parent 6ff5731 commit c642ca5
Show file tree
Hide file tree
Showing 14 changed files with 117 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
- RiotShield
- SpeedLoaderMagnum
- SpeedLoaderMagnumEmpty
- StripperClip # Harmony change - part of RSC PR
- type: BlueprintReceiver
whitelist:
tags:
Expand Down Expand Up @@ -763,6 +764,7 @@
- MagazineShotgun
- MagazineShotgunEmpty
- MagazineShotgunSlug
- StripperClip # Harmony change - part of RSC PR
- RiotShield
- SpeedLoaderMagnum
- SpeedLoaderMagnumEmpty
Expand Down Expand Up @@ -874,6 +876,7 @@
- MagazineShotgunSlug
- SpeedLoaderMagnum
- SpeedLoaderMagnumEmpty
- StripperClip # Harmony change - part of RSC PR
- type: MaterialStorage
whitelist:
tags:
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/_Harmony/Catalog/Cargo/cargo_armory.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: cargoProduct
id: ArmoryRSC
icon:
sprite: _Harmony/Objects/Weapons/Guns/Snipers/rsc-m1917.rsi
state: base
product: CrateArmoryRSC
cost: 1999
category: cargoproduct-category-name-armory
group: market
42 changes: 42 additions & 0 deletions Resources/Prototypes/_Harmony/Catalog/Fills/Crates/armory.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
- type: entity
id: CrateArmoryRSC
parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
name: bolt-action rifle crate
description: Contains several high-powered, bolt-action rifles with sufficient ammunition. Packaging is questionable, your mileage will vary. Requires Armory, Security or Supply access to open.
components:
- type: EntityStorage
capacity: 50
- type: AccessReader
access: [["Armory"], ["Security"], ["Cargo"]]
- type: StorageFill
contents:
- id: WeaponSniperRSC
orGroup: guns
amount: 2
- id: WeaponSniperRSC
orGroup: guns
amount: 3
- id: WeaponSniperRSC
orGroup: guns
amount: 4
- id: WeaponSniperRSC
orGroup: guns
amount: 5
- id: SpeedLoaderLightRifle
orGroup: ammo
amount: 4
- id: SpeedLoaderLightRifle
orGroup: ammo
amount: 8
- id: SpeedLoaderLightRifle
orGroup: ammo
amount: 15
- id: SpeedLoaderLightRifle
orGroup: ammo
amount: 16
- id: SpeedLoaderLightRifle
orGroup: ammo
amount: 23
- id: SpeedLoaderLightRifle
orGroup: ammo
amount: 42
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
name: RSC Modèle 1917
parent: [BaseWeaponSniper, BaseGunWieldable, BaseMajorContraband]
id: WeaponSniperRSC
description: Refurbished great war trophy. It used to bear a french name, now it bears Nanotrasen stamp of approval. Uses .30 rifle ammo.
components:
- type: Sprite
sprite: _Harmony/Objects/Weapons/Guns/Snipers/rsc-m1917.rsi
- type: Clothing
sprite: _Harmony/Objects/Weapons/Guns/Snipers/rsc-m1917.rsi
quickEquip: false
slots:
- Back
- suitStorage
- type: StaticPrice
price: 400
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Harmony/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: latheRecipe
parent: BaseAmmoRecipe
id: StripperClip
result: SpeedLoaderLightRifle
materials:
Steel: 100
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.
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "made by thesaladmancer on Discord / Twitter",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base"
},
{
"name": "bolt-open"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}
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.

0 comments on commit c642ca5

Please sign in to comment.