Skip to content

Commit

Permalink
Ports the Plasteel Arming Sword from Frontier Station (#2836)
Browse files Browse the repository at this point in the history
* adds the plasteel arming sword from frontier

* forgot to change the price back

* hope I did this right

* this time maybe

* :trollface:

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* and that too maybe

* remove reflect chance I think

Signed-off-by: AeraAuling <133451603+AeraAuling@users.noreply.github.com>

* fix indents maybe, I dunno why this part in particular is so difficult for me I just can't SEE right

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* reformat meta.json

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Signed-off-by: AeraAuling <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
  • Loading branch information
3 people authored Feb 11, 2025
1 parent 13f9256 commit 2b64132
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 6 deletions.
16 changes: 14 additions & 2 deletions Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@

- type: cargoProduct
id: ArmoryEnergyGun
icon:
icon:
sprite: _DV/Objects/Weapons/Guns/Battery/energygun.rsi
state: icon
product: CrateArmoryEnergyGun
cost: 5500
category: Armory
group: market

- type: cargoProduct
id: ArmoryEnergyGunMini
icon:
Expand All @@ -47,3 +47,15 @@
cost: 3500
category: Armory
group: market

- type: cargoProduct
id: ArmoryArmingSword
name: Arming Sword Crate
description: Contains two Plasteel Arming Swords. Requires Armory access to open.
icon:
sprite: _NF/Objects/Weapons/Melee/armingsword.rsi
state: icon
product: CrateArmoryArmingSword
cost: 2500
category: Armory
group: market
17 changes: 13 additions & 4 deletions Resources/Prototypes/_DV/Catalog/Fills/Crates/armory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,30 @@
amount: 2
- id: BoxLethalshot
amount: 3

- type: entity
id: CrateArmoryEnergyGun
parent: CrateWeaponSecure
components:
- type: StorageFill
contents:
contents:
- id: WeaponEnergyGun
amount: 3

- type: entity
id: CrateArmoryEnergyGunMini
parent: CrateWeaponSecure
components:
- type: StorageFill
contents:
contents:
- id: WeaponEnergyGunMini
amount: 3

- type: entity
id: CrateArmoryArmingSword
parent: CrateWeaponSecure
components:
- type: StorageFill
contents:
- id: PlasteelArmingSword
amount: 2
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
cost: 500
- id: ClothingBeltSalvageWebbing
cost: 500
- id: PlasteelArmingSword
cost: 500
- id: MedkitBruteFilled
cost: 600
- id: MedkitBurnFilled
Expand Down
25 changes: 25 additions & 0 deletions Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# original PR by MagnusCrowe at https://github.com/new-frontiers-14/frontier-station-14/pull/887

- type: entity
parent: CaptainSabre
id: PlasteelArmingSword
name: plasteel arming sword
description: An ancient design manufactured with modern materials and machines for a very specific target demographic.
components:
- type: Sprite
sprite: _NF/Objects/Weapons/Melee/armingsword.rsi
- type: MeleeWeapon
damage:
types:
Slash: 15
- type: Reflect
reflectProb: 0
spread: 90
- type: Item
sprite: _NF/Objects/Weapons/Melee/armingsword.rsi
- type: Clothing
quickEquip: false
slots:
- back
- suitStorage
- belt
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,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by MagnusCrowe for use on Frontier Station 14.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
}
]
}

0 comments on commit 2b64132

Please sign in to comment.