Merge branch 'master' into 2020-04-28-tool-component

Resources/Groups/groups.yml

@@ -134,3 +134,4 @@
   - gc_mode
   CanViewVar: true
   CanAdminPlace: true
+  CanScript: true

Resources/Locale/nl-NL/tools.yml

@@ -0,0 +1,19 @@
+# Example Dutch translations
+
+- msgid: Wrench
+  msgstr: Moersleutel
+
+- msgid: Welding Tool
+  msgstr: Lasapparaat
+
+- msgid: Crowbar
+  msgstr: Koevoet
+
+- msgid: Screwdriver
+  msgstr: Schroevendraaier
+
+- msgid: Wirecutters
+  msgstr: Draadtang
+
+- msgid: Multitool
+  msgstr: Multi Tool # This is what google translate gives me idk.

Resources/Prototypes/Entities/Buildings/gravity_generator.yml

@@ -0,0 +1,36 @@
+- type: entity
+  id: GravityGenerator
+  name: Gravity Generator
+  description: It's what keeps you to the floor.
+  components:
+    - type: Sprite
+      sprite: Buildings/gravity_generator.rsi
+      layers:
+        - state: on
+        - sprite: Buildings/gravity_generator_core.rsi
+          state: activated
+          shader: unshaded
+    - type: Icon
+      sprite: Buildings/gravity_generator.rsi
+      state: on
+    - type: SnapGrid
+      offset: Center
+    - type: PowerDevice
+      load: 500
+    - type: Collidable
+      shapes:
+        - !type:PhysShapeAabb
+          bounds: "-1.5,-1.5,1.5,1.5"
+          layer: 15
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Damageable
+    - type: Breakable
+      threshold: 150
+    - type: GravityGenerator
+    - type: UserInterface
+      interfaces:
+        - key: enum.GravityGeneratorUiKey.Key
+          type: GravityGeneratorBoundUserInterface
+  placement:
+    mode: AlignTileAny

Resources/Prototypes/Entities/Buildings/medical_scanner.yml

@@ -36,7 +36,6 @@
   - type: Appearance
     visuals:
     - type: MedicalScannerVisualizer2D
-  - type: PowerDevice
   - type: UserInterface
     interfaces:
     - key: enum.MedicalScannerUiKey.Key

Resources/Prototypes/Entities/Items/Clothing/belts.yml

@@ -21,6 +21,7 @@
     state: utilitybelt
   - type: Clothing
     Size: 50
+    QuickEquip: false
     sprite: Clothing/belt_utility.rsi
   - type: Storage
     Capacity: 40 # Full tool loadout is 35, plus an extra

Resources/Prototypes/Entities/Items/Consumables/food.yml

@@ -90,7 +90,7 @@
 #  name: Ambrosia vulgar is crushed
 #  parent: FoodBase
 #  id: FoodAmbrosiaVulgarIsCrushed
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -137,7 +137,7 @@
 #  name: Bacon
 #  parent: FoodBase
 #  id: FoodBacon
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -182,7 +182,7 @@
   name: Bread (slice)
   parent: FoodBase
   id: FoodBreadSlice
-  description: 
+  description:
   components:
   - type: Food
     contents:
@@ -199,7 +199,7 @@
   name: Banana bread (slice)
   parent: FoodBase
   id: FoodBananaBreadSlice
-  description: 
+  description:
   components:
   - type: Food
     contents:
@@ -233,7 +233,7 @@
 #  name: Bear meat
 #  parent: FoodBase
 #  id: FoodBearMeat
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -612,7 +612,7 @@
 #  name: Cocoa
 #  parent: FoodBase
 #  id: FoodCocoa
-#  description: 
+#  description:
 #  components:
 #  - type: Food
 #    uses: 1
@@ -1482,19 +1482,21 @@
   - type: Icon
     sprite: Objects/Food/loadedbakedpotato.rsi
 
-#- type: entity
-#  parent: FoodBase
-#  id: FoodMeat
-#  name: Meat
-#  description: ''
-#  components:
-#  - type: Food
-#    uses: 1
-#    restore_amount: 1
-#  - type: Sprite
-#    sprite: Objects/Food/meat.rsi
-#  - type: Icon
-#    sprite: Objects/Food/meat.rsi
+- type: entity
+  parent: FoodBase
+  id: FoodMeat
+  name: Meat
+  description: A slab of meat.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 5
+  - type: Sprite
+    sprite: Objects/Food/meat.rsi
+  - type: Icon
+    sprite: Objects/Food/meat.rsi
 
 - type: entity
   parent: FoodBase
@@ -2835,19 +2837,21 @@
   - type: Icon
     sprite: Objects/Food/xenobreadslice.rsi
 
-#- type: entity
-#  parent: FoodBase
-#  id: FoodXenomeat
-#  name: Xenomeat
-#  description: ''
-#  components:
-#  - type: Food
-#    uses: 1
-#    restore_amount: 1
-#  - type: Sprite
-#    sprite: Objects/Food/xenomeat.rsi
-#  - type: Icon
-#    sprite: Objects/Food/xenomeat.rsi
+- type: entity
+  parent: FoodBase
+  id: FoodXenomeat
+  name: Xenomeat
+  description: Yum.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 20
+  - type: Sprite
+    sprite: Objects/Food/xenomeat.rsi
+  - type: Icon
+    sprite: Objects/Food/xenomeat.rsi
 
 - type: entity
   parent: FoodBase
@@ -2865,3 +2869,20 @@
     sprite: Objects/Food/xenomeatpie.rsi
   - type: Icon
     sprite: Objects/Food/xenomeatpie.rsi
+
+- type: entity
+  parent: FoodBase
+  id: DisgustingSweptSoup
+  name: Salty Sweet Miso Cola Soup
+  description: Jesus christ.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Bleach
+        Quantity: 15
+    spawn_on_finish: TrashSnackBowl
+  - type: Sprite
+    sprite: Objects/Food/stew.rsi
+  - type: Icon
+    sprite: Objects/Food/stew.rsi

Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml

@@ -0,0 +1,22 @@
+- type: entity
+  parent: BaseItem
+  id: ReagentContainerFlour
+  name: Flour
+  description: Not to be confused with flower.
+  components:
+  - type: Solution
+    maxVol: 50
+    contents:
+      reagents:
+      - ReagentId: chem.Flour
+        Quantity: 50
+  - type: Pourable
+    transferAmount: 5
+  - type: Drink
+    despawn_empty: true
+  - type: Sprite
+    sprite: Objects/Food/flour.rsi
+    state: icon
+  - type: Icon
+    sprite: Objects/Food/flour.rsi
+    state: icon

Resources/Prototypes/Entities/Items/Instruments.yml

@@ -23,6 +23,18 @@
   - type: Icon
     texture: Objects/Instruments/musician.rsi/h_synthesizer.png
 
+- type: entity
+  name: Acoustic Guitar
+  parent: BaseHandheldInstrument
+  id: AcousticGuitarInstrument
+  components:
+  - type: Instrument
+    program: 25
+  - type: Sprite
+    texture: Objects/Instruments/musician.rsi/guitar.png
+  - type: Icon
+    texture: Objects/Instruments/musician.rsi/guitar.png
+
 - type: entity
   name: Violin
   parent: BaseHandheldInstrument

Resources/Prototypes/Entities/Items/bike_horn.yml

@@ -20,6 +20,7 @@
   - type: Sound
   - type: EmitSoundOnUse
     sound: /Audio/items/bikehorn.ogg
+    variation: 0.2
 
   - type: UseDelay
     delay: 0.5

Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml

@@ -42,6 +42,3 @@
   - type: Item
     Size: 24
     sprite: Objects/Guns/SMGs/c20r.rsi
-  - type: Item
-    Size: 24
-    sprite: Objects/Guns/SMGs/wt550.rsi

Resources/Prototypes/Entities/janitor.yml

@@ -34,7 +34,6 @@
     drawdepth: Objects
   - type: Icon
     texture: Objects/Janitorial/mopbucket.png
-  - type: Clickable
   - type: InteractionOutline
   - type: Bucket
   - type: Sound
@@ -51,7 +50,6 @@
   - type: Physics
     mass: 5
     Anchored: false
-  - type: Sound
 
 - type: entity
   parent: BaseItem

Resources/Prototypes/Entities/kitchen.yml

@@ -0,0 +1,40 @@
+- type: entity
+  id: KitchenMicrowave
+  name: Microwave
+  description: It's magic.
+  components:
+  - type: Microwave
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Solution
+    maxVol: 100
+    caps: 1
+  - type: Appearance
+    visuals:
+    - type: MicrowaveVisualizer
+  - type: Sound
+  - type: UserInterface
+    interfaces:
+    - key: enum.MicrowaveUiKey.Key
+      type: MicrowaveBoundUserInterface
+
+
+  - type: Collidable
+    shapes:
+    - !type:PhysShapeAabb
+      bounds: "-0.25,-0.4,0.25,0.4"
+      layer: 15
+    IsScrapingFloor: true
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Kitchen/microwave.rsi
+    layers:
+    - state: mw0
+      map: ["enum.MicrowaveVisualizerLayers.Base"]
+    - state: mw_unlit
+      shader: unshaded
+      map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
+  - type: PowerDevice
+  - type: Icon
+    sprite: Objects/Kitchen/microwave.rsi
+    state: mw0

Resources/Prototypes/Kitchen/meal_recipes.yml

@@ -0,0 +1,338 @@
+
+#Burgers
+- type: microwaveMealRecipe
+  id: RecipeCheeseburger
+  name: Cheeseburger Recipe
+  result: FoodCheeseburger
+  time: 5
+  reagents:
+    chem.Flour: 5
+  solids:
+    FoodMeat: 1
+
+- type: microwaveMealRecipe
+  id: RecipeTofuBurger
+  name: Tofu Burger Recipe
+  result: FoodTofuBurger
+  time: 5
+  reagents:
+    chem.Flour: 15
+  solids:
+    Tofu: 1
+
+- type: microwaveMealRecipe
+  id: RecipeXenoburger
+  name: Xenoburger Recipe
+  result: FoodXenoburger
+  time: 5
+  reagents:
+    chem.Flour: 5
+  solids:
+    FoodXenomeat: 1
+
+- type: microwaveMealRecipe
+  id: RecipeSuperBiteBurger
+  name: Super Bite Burger Recipe
+  result: FoodSuperBiteBurger
+  time: 20
+  reagents:
+    chem.Flour: 15
+    chem.Salt: 5
+    chem.Pepper: 5
+  solids:
+    FoodMeat: 5
+    FoodCheeseWedge: 3
+    FoodTomato: 4
+    FoodEgg: 2
+
+#Breads & Sandwiches
+- type: microwaveMealRecipe
+  id: RecipeBread
+  name: Bread Recipe
+  result: DrinkFoodContainerBread
+  time: 15
+  reagents:
+    chem.Flour: 15
+
+- type: microwaveMealRecipe
+  id: RecipeSandwich
+  name: Sandwich Recipe
+  result: FoodSandwich
+  time: 10
+  solids:
+    FoodBreadSlice: 2
+    FoodMeatSteak: 1
+    FoodCheeseWedge: 1
+
+- type: microwaveMealRecipe
+  id: RecipeToastedSandwich
+  name: Toasted Sandwich Recipe
+  result: FoodToastedSandwich
+  time: 5
+  solids:
+    FoodSandwich: 1
+
+- type: microwaveMealRecipe
+  id: RecipeGrilledCheese
+  name: Grilled Cheese Recipe
+  result: FoodGrilledCheese
+  time: 5
+  solids:
+    FoodBreadSlice: 2
+    FoodCheeseWedge: 1
+
+- type: microwaveMealRecipe
+  id: RecipeBaguette
+  name: Baguette Recipe
+  result: FoodBaguette
+  time: 10
+  reagents:
+    chem.Flour: 15
+    chem.Salt: 1
+    chem.Pepper: 1
+
+- type: microwaveMealRecipe
+  id: RecipeCreamCheeseBread
+  name: Cream Cheese Bread Recipe
+  result: DrinkFoodContainerCreamCheeseBread
+  time: 20
+  reagents:
+    chem.Flour: 15
+  solids:
+    FoodCheeseWedge: 2
+
+- type: microwaveMealRecipe
+  id: RecipeBananaBread
+  name: Banana Bread Recipe
+  result: DrinkFoodContainerBananaBread
+  time: 25
+  reagents:
+    chem.Flour: 15
+    chem.Milk: 5
+  solids:
+    FoodEgg: 3
+    FoodBanana: 1
+
+
+
+#Pizzas
+- type: microwaveMealRecipe
+  id: RecipeMargheritaPizza
+  name: Margherita Pizza Recipe
+  result: DrinkFoodContainerMargheritaPizza
+  time: 30
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodCheeseWedge: 4
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeMushroomPizza
+  name: Mushroom Pizza Recipe
+  result: DrinkFoodContainerMushroomPizza
+  time: 25
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodMushroom: 5
+
+- type: microwaveMealRecipe
+  id: RecipeMeatPizza
+  name: Meat Pizza Recipe
+  result: DrinkFoodContainerMeatPizza
+  time: 30
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodMeat: 3
+    FoodCheeseWedge: 1
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeVegetablePizza
+  name: Vegetable Pizza Recipe
+  result: DrinkFoodContainerVegetablePizza
+  time: 30
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodEggplant: 1
+    FoodCarrot: 1
+    FoodCorn: 1
+    FoodTomato: 1
+
+#Italian
+- type: microwaveMealRecipe
+  id: RecipeSpaghetti
+  name:  Spaghetti Recipe
+  result: FoodSpaghetti
+  time: 1
+  reagents:
+    chem.Flour: 5
+
+- type: microwaveMealRecipe
+  id: RecipeBoiledSpaghetti
+  name: Boiled Spaghetti Recipe
+  result: FoodSpagettiBoiled
+  time: 5
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodSpagetti: 1
+
+- type: microwaveMealRecipe
+  id: RecipePastaTomato
+  name: Pasta Tomato Recipe
+  result: FoodPastaTomato
+  time: 10
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodSpagetti: 1
+    FoodTomato: 2
+
+- type: microwaveMealRecipe
+  id: RecipeMeatballSpaghetti
+  name: Spaghetti & Meatballs Recipe
+  result: FoodMeatballSpaghetti
+  time: 10
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodSpagetti: 1
+    FoodMeatball: 2
+
+- type: microwaveMealRecipe
+  id: RecipeCrabSpaghetti
+  name: Crab Spaghetti Recipe
+  result: FoodCrabSpaghetti
+  time: 10
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodCrabMeat: 2
+
+- type: microwaveMealRecipe
+  id: RecipeCopypasta
+  name: Copypasta Recipe
+  result: FoodCopypasta
+  time: 10
+  solids:
+    FoodPastaTomato: 2
+
+# - type: microwaveMealRecipe
+#   id: RecipeMoMMISpaghetti
+#   name: MoMMI Spaghetti Recipe
+#   result: FoodMoMMISpaghetti
+#   time: 10
+#   reagents:
+#     chem.Flour: 5
+#   solids:
+
+- type: microwaveMealRecipe
+  id: RecipeRisotto
+  name: Risotto Recipe
+  result: FoodRisotto
+  time: 10
+  reagents:
+    chem.Flour: 10 #This should be 10 units of rice.
+    chem.Wine: 5
+  solids:
+    FoodCheeseWedge: 1
+
+- type: microwaveMealRecipe
+  id: RecipeBruschetta
+  name: Bruschetta Recipe
+  result: FoodBruschetta
+  time: 10
+  reagents:
+    chem.Flour: 10
+    chem.Salt: 2
+  solids:
+    FoodGarlic: 1
+    FoodCheeseWedge: 1
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeQuiche
+  name: Quiche Recipe
+  result: FoodQuiche
+  time: 10
+  solids:
+    FoodBlueTomato: 1
+    FoodGarlic: 1
+    FoodEgg: 1
+    FoodCheeseWedge: 1
+
+- type: microwaveMealRecipe
+  id: RecipeLasagna
+  name: Lasagna Recipe
+  result: FoodLasagna
+  time: 15
+  # reagents:
+  #   chem.TomatoJuice: 15
+  solids:
+    FoodFlatDough: 2
+    FoodMeat: 2
+    FoodEggPlant: 1
+    FoodCheeseWedge: 1
+
+#Soups & Stew
+- type: microwaveMealRecipe
+  id: RecipeMeatballSoup
+  name: Meatball Soup Recipe
+  result: FoodMeatballSoup
+  time: 10
+  reagents:
+    chem.H2O: 10
+  solids:
+    FoodMeatball: 1
+    FoodCarrot: 1
+    FoodPotato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeNettleSoup
+  name: Nettle Soup Recipe
+  result: FoodNettleSoup
+  time: 10
+  reagents:
+    chem.H2O: 10
+  solids:
+    FoodNettle: 1
+    FoodEgg: 1
+    FoodPotato: 1
+
+#Other
+- type: microwaveMealRecipe
+  id: RecipeMeatSteak
+  name: Meat Steak Recipe
+  result: FoodMeatSteak
+  time: 10
+  reagents:
+    chem.Salt: 1
+    chem.Pepper: 1
+  solids:
+    FoodMeat: 1
+
+- type: microwaveMealRecipe
+  id: RecipeMisoColaSoup
+  name: Salty Sweet MiloCola Soup Recipe
+  result: DisgustingSweptSoup
+  time: 15
+  reagents:
+    chem.Cola: 5
+  solids:
+    FoodMiloSoup: 1
+
+
+
+#Handy template for copy **pasta**. Get it? Pasta? Aw whatever fuck you.
+# - type: microwaveMealRecipe
+#   id:
+#   name:
+#   result:
+#   time: 5
+#   reagents:
+
+#   solids:

Resources/Prototypes/LatheRecipes/tools.yml

@@ -8,7 +8,9 @@
 
 - type: latheRecipe
   id: Screwdriver
-  icon: Objects/Tools/screwdriver.png
+  icon:
+    sprite: Objects/Tools/screwdriver.rsi
+    state: screwdriver
   result: Screwdriver
   completetime: 500
   materials:
@@ -16,7 +18,9 @@
 
 - type: latheRecipe
   id: Welder
-  icon: Objects/Tools/autolathe_welder.png
+  icon:
+    sprite: Objects/Tools/welder.rsi
+    state: welder
   result: Welder
   completetime: 500
   materials:
@@ -51,7 +55,9 @@
 
 - type: latheRecipe
   id: Multitool
-  icon: Objects/Tools/multitool.png
+  icon:
+    sprite: Objects/Tools/multitool.rsi
+    state: multitool
   result: Multitool
   completetime: 500
   materials:

Resources/Prototypes/Reagents/food_reagents.yml

@@ -0,0 +1,8 @@
+- type: reagent
+  id: chem.Flour
+  name: Flour
+  desc: Used for baking.
+  color: "#FFFFFF"
+  metabolism:
+    - !type:DefaultFood
+      rate: 1

Resources/Textures/Buildings/gravity_generator.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version":1,
+    "size":{
+        "x":96,
+        "y":96
+    },
+    "license":"CC-BY-SA-3.0",
+    "copyright":"Taken from https://github.com/tgstation/tgstation",
+    "states":[
+        {
+            "name":"on",
+            "directions": 1
+        },
+        {
+            "name": "off",
+            "directions": 1
+        },
+        {
+            "name": "broken",
+            "directions": 1
+        }
+    ]
+}

Resources/Textures/Buildings/gravity_generator_core.rsi/meta.json

@@ -0,0 +1,20 @@
+{
+    "version":1,
+    "size":{
+        "x":32,
+        "y":32
+    },
+    "license":"CC-BY-SA-3.0",
+    "copyright":"Taken from https://github.com/tgstation/tgstation",
+    "states":[
+        {
+            "name": "activated",
+            "directions": 1,
+            "delays": [
+                [0.1,
+                0.1,
+                0.1]
+            ]
+        }
+    ]
+}

Resources/Textures/Objects/Kitchen/microwave.rsi/meta.json

@@ -0,0 +1,105 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "AGPL v3",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris",
+    "states": [
+        {
+            "name": "mw",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "mw_unlit",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },		
+        {
+            "name": "mw0",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "mw_running_unlit",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "mwb",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "mwbloody",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "mwbloody0",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "mwbloody1",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "mwbloodyo",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "mwo",
+            "directions": 1,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}

Resources/keybinds.yml

@@ -1,9 +1,16 @@
 version: 1 # Not used right now, whatever.
 binds:
-- function: UseOrAttack
+- function: UIClick
   type: state
   key: MouseLeft
   canFocus: true
+- function: Use
+  type: state
+  key: MouseLeft
+  canFocus: true
+- function: WideAttack
+  type: state
+  key: Space
 - function: ShowDebugMonitors
   type: Toggle
   key: F3
@@ -65,6 +72,14 @@ binds:
 - function: OpenCharacterMenu
   type: State
   key: C
+- function: TextCursorSelect
+  # TextCursorSelect HAS to be above ExamineEntity
+  # So that LineEdit receives it correctly.
+  # TODO: Make it so that UI keybinds are somehow prioritized so this ordering stuff isn't necessary.
+  type: state
+  key: MouseLeft
+  mod1: Shift
+  canFocus: true
 - function: ExamineEntity
   type: State
   key: MouseLeft
@@ -94,6 +109,14 @@ binds:
 - function: OpenInventoryMenu
   type: state
   key: I
+- function: SmartEquipBackpack
+  type: State
+  key: B
+  mod1: Shift
+- function: SmartEquipBelt
+  type: State
+  key: E
+  mod1: Shift
 - function: ShowDebugConsole
   type: state
   key: Tilde
@@ -109,6 +132,16 @@ binds:
   type: state
   key: Right
   canRepeat: true
+- function: TextCursorWordLeft
+  type: state
+  key: Left
+  mod1: Control
+  canRepeat: true
+- function: TextCursorWordRight
+  type: state
+  key: Right
+  mod1: Control
+  canRepeat: true
 - function: TextCursorBegin
   type: state
   key: Home
@@ -116,6 +149,37 @@ binds:
   type: state
   key: End
   canRepeat: true
+- function: TextCursorSelectLeft
+  type: state
+  key: Left
+  mod1: Shift
+  canRepeat: true
+- function: TextCursorSelectRight
+  type: state
+  key: Right
+  mod1: Shift
+  canRepeat: true
+- function: TextCursorSelectWordLeft
+  type: state
+  key: Left
+  mod1: Shift
+  mod2: Control
+  canRepeat: true
+- function: TextCursorSelectWordRight
+  type: state
+  key: Right
+  mod1: Shift
+  mod2: Control
+  canRepeat: true
+- function: TextCursorSelectBegin
+  type: state
+  mod1: Shift
+  key: Home
+- function: TextCursorSelectEnd
+  type: state
+  mod1: Shift
+  key: End
+  canRepeat: true
 - function: TextBackspace
   type: state
   key: BackSpace
@@ -126,6 +190,18 @@ binds:
 - function: TextSubmit
   type: state
   key: NumpadEnter
+- function: TextSelectAll
+  type: state
+  key: A
+  mod1: Control
+- function: TextCopy
+  type: state
+  key: C
+  mod1: Control
+- function: TextCut
+  type: state
+  key: X
+  mod1: Control
 - function: TextPaste
   type: state
   key: V
@@ -155,3 +231,10 @@ binds:
 - function: OpenSandboxWindow
   type: state
   key: B
+- function: TakeScreenshot
+  type: state
+  key: F2
+- function: TakeScreenshotNoUI
+  type: state
+  key: F2
+  mod1: Shift