Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14

2025-01-26 16:05:23 +03:00
parent b0189002e8 c670b79fd0
commit 14930094d7
2 changed files with 13 additions and 1 deletions
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml
@@ -28,4 +28,4 @@
    - CP14EnergyCrystalSmall
  equipment:
    belt1: CP14WalletFilledTest
-  #  keys: CP14KeyRingInnkeeper
+    keys: CP14KeyRingInnkeeper
--- a/signatures/version1/cla.json
+++ b/signatures/version1/cla.json
@@ -0,0 +1,12 @@
+{
+  "signedContributors": [
+    {
+      "name": "TheShuEd",
+      "id": 96445749,
+      "comment_id": 2614407387,
+      "created_at": "2025-01-26T12:54:29Z",
+      "repoId": 778936029,
+      "pullRequestNo": 810
+    }
+  ]
+}