Skip to content

Commit

Permalink
Added Argenti to the Security Loadout. (#135)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Adds a lethal and non-lethal Argenti for the security loadout, adds
missing magazines to the ammofab.

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added security issued Argentis with lethal and non-lethal options
into the security loadout. Rootin' tootin' cowboy shootin'!
- add: Added recipes for the magazines for the salvage rifles into the
ammo fabricator.

---------

Co-authored-by: Rosycup <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>
  • Loading branch information
Rosycup authored Jan 7, 2025
1 parent 48b95ef commit 8d80bd7
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
mask:
- MachineMask
layer:
- MachineLayer
- MachineLayer
- type: Lathe
- type: MaterialStorage
- type: Destructible
Expand Down Expand Up @@ -989,12 +989,16 @@
- MagazinePistolEmpty
- MagazineRifle
- MagazineRifleEmpty
- MagazineNovaliteC1
- MagazineNovaliteC1Empty
- MagazineShotgun
- MagazineShotgunEmpty
- MagazineShotgunSlug
- ShellTranquilizer
- SpeedLoaderMagnum
- SpeedLoaderMagnumEmpty
- SpeedLoaderRifleHeavy
- SpeedLoaderRifleHeavyEmpty
- CartridgeSpecial
- MagazineBoxSpecial
- type: MaterialStorage
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- type: entity
parent: WeaponRevolverArgenti
id: WeaponRevolverArgentiSecurity
description: The military grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo.
The serial number on the handguard marks this gun as belonging to an NT Security Officer.
components:
- type: GuideHelp
guides: [ SecurityWeapons ]

- type: entity
parent: WeaponRevolverArgenti
id: WeaponRevolverArgentiNonLethalSecurity
suffix: Non-lethal
description: The military grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Comes with .20 rubber rifle ammo.
The serial number on the handguard marks this gun as belonging to an NT Security Officer.
components:
- type: RevolverAmmoProvider
capacity: 8
proto: CartridgeRifleRubber
chambers: [ True, True, True, True, True, True, True, True ]
ammoSlots: [ null, null, null, null, null, null, null, null ]
- type: GuideHelp
guides: [ SecurityWeapons ]
94 changes: 94 additions & 0 deletions Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
- type: loadout
id: LoadoutSpeedLoaderRifleHeavy
category: JobsSecurityAUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 3600 # 1 hours
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityEquipment
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- SpeedLoaderRifleHeavy

- type: loadout
id: LoadoutSpeedLoaderRifleHeavySpare
category: JobsSecurityAUncategorized
cost: 4
exclusive: true
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 3600 # 1 hours
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityEquipment
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- SpeedLoaderRifleHeavy

- type: loadout
id: LoadoutSpeedLoaderRifleHeavyRubber
category: JobsSecurityAUncategorized
cost: 2
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityEquipment
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- SpeedLoaderRifleHeavyRubber

- type: loadout
id: LoadoutSpeedLoaderRifleHeavyRubberSpare
category: JobsSecurityAUncategorized
cost: 4
exclusive: true
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityEquipment
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- SpeedLoaderRifleHeavyRubber

- type: loadout
id: LoadoutSecurityArgenti
category: JobsSecurityAUncategorized
cost: 0
canBeHeirloom: true
guideEntry: SecurityWeapons
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 3600 # 1 hours
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityWeapons
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- WeaponRevolverArgentiSecurity

- type: loadout
id: LoadoutSecurityArgentiNonLethal
category: JobsSecurityAUncategorized
cost: 0
canBeHeirloom: true
guideEntry: SecurityWeapons
requirements:
- !type:CharacterItemGroupRequirement
group: LoadoutSecurityWeapons
- !type:CharacterDepartmentRequirement
departments:
- Security
items:
- WeaponRevolverArgentiNonLethalSecurity
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@
magState: rubber
steps: 9
zeroVisible: false
- type: Appearance
- type: Appearance

0 comments on commit 8d80bd7

Please sign in to comment.