From b1ecc298aaf9b8a7f87ed55fa528e72512c87cd2 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Thu, 29 Jun 2023 13:03:47 +0200
Subject: [PATCH] Fixes two bounty-related cargo control bugs and a paper
 runtime. (#16576)

* Fixes two bounty-related cargo control bugs and a paper runtime.

* whoopies

* sdasdas

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
---
 code/modules/paperwork/paper.dm               |  3 +-
 html/changelogs/mattatlas-slowthefuckdown.yml | 43 +++++++++++++++++++
 .../packages/tgui/interfaces/CargoControl.tsx | 14 +++++-
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/mattatlas-slowthefuckdown.yml

diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 3351bb1ce8c..86647b4f918 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -5,6 +5,7 @@
 
 /obj/item/paper
 	name = "paper"
+	desc = "A piece of paper."
 	gender = NEUTER
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper"
@@ -731,7 +732,7 @@
 		welding goggles.</li><li>Grasp the emergency welding tool firmly in your hands, turn it on, and start cutting a hole in the floor.</li><li>Wait for \
 		the newly created hole to cool.<li>Use the emergency crowbar to pry away the metal.</li><li>Deploy the emergency ladder.</li><li>Dispose of the used \
 		equipment, if necessary.</li></ol></font></font>"
-		
+
 // Used on the IAC ship, meant for distribution.
 /obj/item/paper/fluff/iac
 	name = "interstellar aid corps info pamphlet"
diff --git a/html/changelogs/mattatlas-slowthefuckdown.yml b/html/changelogs/mattatlas-slowthefuckdown.yml
new file mode 100644
index 00000000000..0a52d5c5df1
--- /dev/null
+++ b/html/changelogs/mattatlas-slowthefuckdown.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixed cargo control not having a 'claim bounty' button."
+  - bugfix: "Fixed the cargo control having a typo'd icon for the print bounties button."
+  - bugfix: "Fixed a paper-related runtime."
diff --git a/tgui/packages/tgui/interfaces/CargoControl.tsx b/tgui/packages/tgui/interfaces/CargoControl.tsx
index 3e99ae9a80a..582ccfe7398 100644
--- a/tgui/packages/tgui/interfaces/CargoControl.tsx
+++ b/tgui/packages/tgui/interfaces/CargoControl.tsx
@@ -572,7 +572,7 @@ export const Bounties = (props, context) => {
       buttons={
         <Button
           content="Print"
-          icon="Print"
+          icon="print"
           onClick={() => act('bounty_print')}
         />
       }>
@@ -593,7 +593,17 @@ export const Bounties = (props, context) => {
             <Table.Cell>{bounty.reward_string}</Table.Cell>
             <Table.Cell>{bounty.completion_string}</Table.Cell>
             <Table.Cell textColor={bounty.claimed ? 'green' : 'red'}>
-              {bounty.claimed ? 'Claimed' : 'Unclaimed'}
+              {bounty.claimed ? (
+                'Claimed'
+              ) : (
+                <Button
+                  content="Unclaimed"
+                  icon="star"
+                  onClick={() =>
+                    act('claim_bounty', { claim_bounty: bounty.name })
+                  }
+                />
+              )}
             </Table.Cell>
           </Table.Row>
         ))}