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

New revolver Rex #16211

Closed
wants to merge 3 commits into from
Closed
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 @@ -12,3 +12,6 @@ ent-CrateArmoryLaser = lasers crate

ent-CrateArmoryPistols = pistols crate
.desc = Contains two standard NT pistols with four mags. Requires Armory access to open.

ent-CrateRevolver = revolver crate
.desc = Crate with one reliable Rex revolver, a weapon in case there is a threat for which a regular pistol will not be enough. Requires Armory access to open.
10 changes: 10 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,13 @@
cost: 1700
category: Armory
group: market

- type: cargoProduct
id: ArmoryRevolver
icon:
sprite: Objects/Weapons/Guns/Revolvers/rex.rsi
state: icon
product: CrateRevolver
cost: 1200
category: Armory
group: market
11 changes: 11 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/armory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,14 @@
amount: 2
- id: MagazinePistol
amount: 4

- type: entity
id: CrateRevolver
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id should have rex since there are other revolvers in the game

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id should have rex since there are other revolvers in the game

I can do CrateRevolverRex, it's all right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ye

parent: CrateWeaponSecure
components:
- type: StorageFill
contents:
- id: WeaponRevolverRex
amount: 1
- id: SpeedLoaderMagnum
amount: 3
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,21 @@
chambers: [ True, True, True, True, True, True ]
ammoSlots: [ null, null, null, null, null, null ]

- type: entity
name: Rex
parent: BaseWeaponRevolver
id: WeaponRevolverRex
description: Robust revolver with a rubberized grip and stainless steel finish, a good argument in dangerous situations. Uses .45 magnum ammo.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/rex.rsi
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/rex.rsi
- type: RevolverAmmoProvider
capacity: 6
chambers: [ True, True, True, True, True, True ]
ammoSlots: [ null, null, null, null, null, null ]

- type: entity
name: Mateba
parent: BaseWeaponRevolver
Expand Down
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,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "modified Inspector revolver sprite by TaralGit, original sprite taken from Desertrose https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce , https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
}
]
}