Improves the HUD (#3655)

* All good except the combat doll

* Makes the HUD inventory less terrible

* Cleanup, nuke the Combat Mode button

* Harm icon

* Switch the icon

* Basic goon hud

* Toggleable

* Nuke the popup, properly centers it

* Fix clicking the button

* Nuke some old code

* missed a comment

* Remove defaults

* Localization

* Nuke some old yaml

* New sprites

Co-authored-by: ike709 <sparebytes@protonmail.com>

Resources/Locale/en-US/ui/hud.ftl

@@ -0,0 +1,5 @@
+### HUD stuff
+
+## Combat mode
+hud-combat-enabled = Combat mode enabled!
+hud-combat-disabled = Combat mode disabled.

Resources/Locale/en-US/ui/options.ftl

@@ -63,7 +63,6 @@ ui-options-function-activate-item-in-world = Activate item in world
 ui-options-function-drop = Drop item
 ui-options-function-examine-entity = Examine
 ui-options-function-swap-hands = Swap hands
-ui-options-function-toggle-combat-mode = Toggle combat mode
 
 ui-options-function-smart-equip-backpack = Smart-equip to backpack
 ui-options-function-smart-equip-belt = Smart-equip to belt

Resources/Prototypes/Actions/actions.yml

@@ -1,4 +1,25 @@
 - type: action
+  actionType: CombatMode
+  icon: Interface/Actions/harm.png
+  name: "[color=red]Combat Mode[/color]"
+  description: "Enter combat mode."
+  filters:
+    - human
+  behaviorType: Toggle
+  behavior: !type:CombatMode
+
+- type: action
+  actionType: Disarm
+  icon: Interface/Actions/disarm.png
+  name: "[color=red]Disarm[/color]"
+  description: "Attempt to [color=red]disarm[/color] someone."
+  filters:
+    - human
+  behaviorType: TargetEntity
+  repeat: true
+  behavior: !type:DisarmAction { }
+
+- type: action
   actionType: HumanScream
   icon: Interface/Actions/scream.png
   name: "Scream"
@@ -22,17 +43,6 @@
       - /Audio/Voice/Human/femalescream_5.ogg
     wilhelm: /Audio/Voice/Human/wilhelm_scream.ogg
 
-- type: action
-  actionType: Disarm
-  icon: Interface/Actions/disarm.png
-  name: "[color=red]Disarm[/color]"
-  description: "Attempt to [color=red]disarm[/color] someone."
-  filters:
-    - human
-  behaviorType: TargetEntity
-  repeat: true
-  behavior: !type:DisarmAction { }
-
 - type: action
   actionType: GhostBoo
   icon: Interface/Actions/scream.png

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -14,8 +14,9 @@
   - type: Alerts
   - type: Actions
     innateActions:
-      - HumanScream
+      - CombatMode
       - Disarm
+      - HumanScream
   - type: Eye
     zoom: 0.5, 0.5
   - type: CameraRecoil

Resources/Textures/Interface/Actions/meta.json

@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8. Harm and disarm heavily modified.",
     "states": [
         {
             "name": "internal0"
@@ -18,6 +18,9 @@
         },
         {
             "name": "disarm"
-        }
+        },
+		{
+			"name": "harm"
+		}
     ]
 }

Resources/Textures/Interface/Inventory/meta.json

@@ -0,0 +1,68 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Heavily derived from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac.",
+    "states": [
+        {
+            "name": "back",
+        },
+        {
+            "name": "belt"
+        },
+        {
+            "name": "block"
+        },
+        {
+            "name": "ears"
+        },
+        {
+            "name": "glasses"
+        },
+        {
+            "name": "gloves"
+        },
+        {
+            "name": "hand_l"
+        },
+        {
+            "name": "hand_l_active"
+        },
+        {
+            "name": "hand_r"
+        },
+        {
+            "name": "hand_r_active"
+        },
+        {
+            "name": "head"
+        },
+        {
+            "name": "id"
+        },
+        {
+            "name": "invtoggle"
+        },
+        {
+            "name": "mask"
+        },
+		{
+            "name": "neck"
+        },
+        {
+            "name": "pocket"
+        },
+        {
+            "name": "shoes"
+        },
+        {
+            "name": "suit"
+        },
+        {
+            "name": "uniform"
+        }
+    ]
+}

Resources/keybinds.yml

@@ -130,9 +130,6 @@ binds:
   type: State
   key: MouseRight
   canFocus: true
-- function: ToggleCombatMode
-  type: State
-  key: R
 - function: OpenCraftingMenu
   type: State
   key: G