diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 97be6fb1e4..7456163010 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -16,7 +16,7 @@ mask: - MachineMask layer: - - MachineLayer + - MachineLayer - type: Lathe - type: MaterialStorage - type: Destructible @@ -989,12 +989,16 @@ - MagazinePistolEmpty - MagazineRifle - MagazineRifleEmpty + - MagazineNovaliteC1 + - MagazineNovaliteC1Empty - MagazineShotgun - MagazineShotgunEmpty - MagazineShotgunSlug - ShellTranquilizer - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + - SpeedLoaderRifleHeavy + - SpeedLoaderRifleHeavyEmpty - CartridgeSpecial - MagazineBoxSpecial - type: MaterialStorage diff --git a/Resources/Prototypes/_DEN/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_DEN/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml new file mode 100644 index 0000000000..994e0c00d4 --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -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 ] diff --git a/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml new file mode 100644 index 0000000000..5c7b245c33 --- /dev/null +++ b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml index b1418d9d76..38e98a0b89 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -147,4 +147,4 @@ magState: rubber steps: 9 zeroVisible: false - - type: Appearance \ No newline at end of file + - type: Appearance