diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 4a590da79d..178b3e7a6e 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -16,7 +16,8 @@ Slash: 0.5 Piercing: 0.7 Shock: 1.2 - + +# Like metallic but very strong to resist most all basic tools and weapons. - type: damageModifierSet id: StrongMetallic coefficients: @@ -27,7 +28,9 @@ flatReductions: Blunt: 16 Slash: 16 - Piercing: 10 + Piercing: 16 + Shock: 10 + Heat: 10 - type: damageModifierSet id: Inflatable diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml index f5f95c1f70..d80f616c11 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml @@ -23,7 +23,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -35,3 +35,12 @@ SheetSteel1: min: 1 max: 2 + +- type: entity + id: LockerBaseSecure + parent: LockerBase + abstract: true + components: + - type: Damageable + damageContainer: Inorganic + damageModifierSet: StrongMetallic \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 4bd85c9a1d..d8073e3104 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -32,7 +32,7 @@ # Command - type: entity id: LockerCaptain - parent: LockerBase + parent: LockerBaseSecure name: captain's locker components: - type: Appearance @@ -44,7 +44,7 @@ - type: entity id: LockerHeadOfPersonnel - parent: LockerBase + parent: LockerBaseSecure name: head of personnel's locker components: - type: Appearance @@ -57,7 +57,7 @@ # CE - type: entity id: LockerChiefEngineer - parent: LockerBase + parent: LockerBaseSecure name: chief engineer's locker components: - type: Appearance @@ -191,7 +191,7 @@ # CMO - type: entity id: LockerChiefMedicalOfficer - parent: LockerBase + parent: LockerBaseSecure name: chief medical officer's locker components: - type: Appearance @@ -202,7 +202,6 @@ access: [ [ "Medical", "Command" ] ] # Science - - type: entity id: LockerResearchDirector parent: LockerBase @@ -230,7 +229,7 @@ # HoS - type: entity id: LockerHeadOfSecurity - parent: LockerBase + parent: LockerBaseSecure name: head of security's locker components: - type: Appearance @@ -243,7 +242,7 @@ # Warden - type: entity id: LockerWarden - parent: LockerBase + parent: LockerBaseSecure name: warden's locker components: - type: Appearance @@ -256,7 +255,7 @@ # Security Officer - type: entity id: LockerSecurity - parent: LockerBase + parent: LockerBaseSecure name: security officer's locker components: - type: Appearance @@ -277,11 +276,10 @@ access: [["Service"]] # TODO access [["Detective"]] # Syndicate - - type: entity id: LockerSyndicatePersonal name: armory closet - parent: LockerBase + parent: LockerBaseSecure description: It's a personal storage unit for operative gear. components: - type: Appearance