Merge branch 'master' into clothing

2019-08-10 13:42:44 +02:00
parent 89c485200b 7c3cf945cf
commit ab954c9f53
1 changed files with 2 additions and 2 deletions
--- a/Resources/Prototypes/Entities/items/clothing/hats.yml
+++ b/Resources/Prototypes/Entities/items/clothing/hats.yml
@@ -28,7 +28,7 @@
  parent: HatBase
  id: HatCaptain
  name: Captain's Hat
-  description: It's good being the king.
+  description: It's good to be king.
  components:
  - type: Sprite
    sprite: Clothing/captain_hat.rsi
@@ -73,4 +73,4 @@
  - type: Clothing
    sprite: Clothing/beret.rsi
    Slots:
-      - helmet           
+      - helmet