Skip to content

Commit

Permalink
Merge branch 'The-Arcadis-Team:master' into crmorerandomshit
Browse files Browse the repository at this point in the history
  • Loading branch information
Creatorbot01 authored Jan 22, 2025
2 parents 3b4af94 + dbfcd4b commit 2d7e14c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Resources/Prototypes/_Arc/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetMERC
name: Mercenary headset
description: ATTENTION! FIVE MINUTES LEFT IN THE MISSION, FIVE MINUTES LEFT IN THE MISSION!2
name: mercenary headset
description: ATTENTION! FIVE MINUTES LEFT IN THE MISSION, FIVE MINUTES LEFT IN THE MISSION!
components:
- type: ContainerFill
containers:
Expand All @@ -52,8 +52,8 @@
- type: entity
parent: EncryptionKey
id: EncryptionKeyMERC
name: Mercenary encryption key
description: An encryption key used by mercenarys.
name: mercenary encryption key
description: An encryption key used by mercenaries.
components:
- type: EncryptionKey
channels:
Expand Down

0 comments on commit 2d7e14c

Please sign in to comment.