forked from impstation/imp-station-14
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed contraband on the beanbag kammerer and bandolier
- Loading branch information
Showing
12 changed files
with
119 additions
and
108 deletions.
There are no files selected for viewing
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
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
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
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
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
9 changes: 9 additions & 0 deletions
9
Resources/Prototypes/_Impstation/Catalog/Cargo/cargo_security.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: SecurityShotgunNonLethal | ||
| icon: | ||
| sprite: _Impstation/Objects/Weapons/Guns/Shotguns/beanbagpump.rsi | ||
| state: icon | ||
| product: CrateSecurityShotgunNonlethal | ||
| cost: 2000 | ||
| category: cargoproduct-category-name-security | ||
| group: market |
12 changes: 12 additions & 0 deletions
12
Resources/Prototypes/_Impstation/Catalog/Fills/Crates/security.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,12 @@ | ||
| - type: entity | ||
| id: CrateSecurityShotgunNonlethal | ||
| parent: CrateSecgear | ||
| name: nonlethal shotgun crate | ||
| description: For when you need to break some ribs. Contains two Beanbag Kammerer shotguns with extra ammunition. Requires Security access to open. | ||
| components: | ||
| - type: StorageFill | ||
| contents: | ||
| - id: WeaponShotgunKammererBeanbag | ||
| amount: 2 | ||
| - id: BoxBeanbag | ||
| amount: 3 |
62 changes: 62 additions & 0 deletions
62
Resources/Prototypes/_Impstation/Entities/Objects/Weapons/Guns/Shotguns/shotguns.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,62 @@ | ||
| - type: entity | ||
| name: Beanbag Enforcer | ||
| parent: WeaponShotgunEnforcer | ||
| id: WeaponShotgunEnforcerBeanbag | ||
| description: A premium combat shotgun with an extended magazine and a built-in silencer, modified to only accept .50 beanbag shotgun shells. Carry gauze. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Impstation/Objects/Weapons/Guns/Shotguns/beanbagenforcer.rsi | ||
| - type: Clothing | ||
| sprite: _Impstation/Objects/Weapons/Guns/Shotguns/beanbagenforcer.rsi | ||
| - type: Item | ||
| sprite: _Impstation/Objects/Weapons/Guns/Shotguns/beanbagenforcer_inhands_64x.rsi | ||
| - type: Gun | ||
| fireRate: 2 | ||
| selectedMode: SemiAuto | ||
| availableModes: | ||
| - SemiAuto | ||
| soundGunshot: | ||
| path: /Audio/_Impstation/Weapons/Guns/Gunshots/silenced2.ogg | ||
| soundEmpty: | ||
| path: /Audio/Weapons/Guns/Empty/empty.ogg | ||
| - type: BallisticAmmoProvider | ||
| whitelist: | ||
| tags: | ||
| - ShellShotgunBeanbag | ||
| capacity: 7 | ||
| proto: ShellShotgunBeanbag | ||
| soundInsert: | ||
| path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg | ||
|
|
||
| - type: entity | ||
| name: Beanbag Kammerer | ||
| parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorSecurityCivilianContraband] | ||
| id: WeaponShotgunKammererBeanbag | ||
| description: A pump shotgun with a built-in silencer, modified to only accept .50 beanbag shotgun shells. Carry gauze. | ||
| components: | ||
| - type: Item | ||
| size: Normal | ||
| shape: | ||
| - 0,0,4,0 | ||
| sprite: _Impstation/Objects/Weapons/Guns/Shotguns/beanbagpump_inhands_64x.rsi | ||
| - type: Sprite | ||
| sprite: _Impstation/Objects/Weapons/Guns/Shotguns/beanbagpump.rsi | ||
| - type: Clothing | ||
| sprite: _Impstation/Objects/Weapons/Guns/Shotguns/beanbagpump.rsi | ||
| - type: Gun | ||
| fireRate: 2 | ||
| selectedMode: SemiAuto | ||
| availableModes: | ||
| - SemiAuto | ||
| soundGunshot: | ||
| path: /Audio/_Impstation/Weapons/Guns/Gunshots/silenced2.ogg | ||
| soundEmpty: | ||
| path: /Audio/Weapons/Guns/Empty/empty.ogg | ||
| - type: BallisticAmmoProvider | ||
| whitelist: | ||
| tags: | ||
| - ShellShotgunBeanbag | ||
| capacity: 4 | ||
| proto: ShellShotgunBeanbag | ||
| soundInsert: | ||
| path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg |
15 changes: 15 additions & 0 deletions
15
Resources/Prototypes/_Impstation/Entities/Objects/base_contraband.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,15 @@ | ||
| - type: entity | ||
| id: BaseMinorSecurityCivilianContraband | ||
| parent: BaseMinorContraband | ||
| abstract: true | ||
| components: | ||
| - type: Contraband | ||
| allowedDepartments: [ Security, Civilian ] | ||
|
|
||
| - type: entity | ||
| id: BaseMinorCivilianContraband | ||
| parent: BaseMinorContraband | ||
| abstract: true | ||
| components: | ||
| - type: Contraband | ||
| allowedDepartments: [ Civilian ] |
17 changes: 17 additions & 0 deletions
17
Resources/Prototypes/_Impstation/Recipes/Lathes/security.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,17 @@ | ||
| - type: latheRecipe | ||
| parent: BaseWeaponRecipe | ||
| id: WeaponShotgunKammererBeanbag | ||
| result: WeaponShotgunKammererBeanbag | ||
| materials: | ||
| Steel: 300 | ||
| Glass: 200 | ||
| Plastic: 200 | ||
|
|
||
| - type: latheRecipe | ||
| parent: BaseWeaponRecipe | ||
| id: WeaponShotgunEnforcerBeanbag | ||
| result: WeaponShotgunEnforcerBeanbag | ||
| materials: | ||
| Steel: 1000 | ||
| Glass: 500 | ||
| Plastic: 500 |
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 |
|---|---|---|
|
|
@@ -3,3 +3,6 @@ | |
|
|
||
| - type: Tag | ||
| id: WeaponCleanerLakeUpgradeKit | ||
|
|
||
| - type: Tag | ||
| id: ShellShotgunBeanbag | ||
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 |
|---|---|---|
|
|
@@ -1267,9 +1267,6 @@ | |
| - type: Tag | ||
| id: ShellShotgun | ||
|
|
||
| - type: Tag | ||
| id: ShellShotgunBeanbag | ||
|
|
||
| - type: Tag | ||
| id: Shiv | ||
|
|
||
|
|
||