diff --git a/gamedir/Data-1.13/BigItems/GUN369.STI b/gamedir/Data-1.13/BigItems/GUN369.STI
new file mode 100644
index 000000000..94cb65bed
Binary files /dev/null and b/gamedir/Data-1.13/BigItems/GUN369.STI differ
diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 72f03564c..1d54c2bec 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -1760,9 +1760,18 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35
; Should a 'thermometer' for guns and replacable barrels be displayed?
OVERHEATING_DISPLAY_THERMOMETER = TRUE
-; If a barrel is not in someone's inventory, it cools down a little bit better
+; Starting amount of red colour in the temperature bar. Must be in [0, 255]
+OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100
+
+; If a barrel is not in someone's inventory, it cools down a little bit better.
OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15
+; Should the temperature of all items lying on the ground in a sector be set to zero upon loading a different sector?
+; Due to engine limitations, the temperature will otherwise stay what I was when another sector was loaded.
+; This can be exploited, but why would you do that?
+; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are.
+OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = TRUE
+
;******************************************************************************************************************************
;******************************************************************************************************************************
diff --git a/gamedir/Data-1.13/TableData/AttachmentSlots.xml b/gamedir/Data-1.13/TableData/AttachmentSlots.xml
index 753cb5367..7a58fa9d0 100644
--- a/gamedir/Data-1.13/TableData/AttachmentSlots.xml
+++ b/gamedir/Data-1.13/TableData/AttachmentSlots.xml
@@ -135,10 +135,10 @@
Underbarrel Attachments
512
1
- 58
+ 18
120
0
- 0
+ 1
14
@@ -146,7 +146,7 @@
1024
1
18
- 120
+ 148
0
0
diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml
index 213069016..4b48e1402 100644
--- a/gamedir/Data-1.13/TableData/Attachments.xml
+++ b/gamedir/Data-1.13/TableData/Attachments.xml
@@ -30738,4 +30738,256 @@
8
0
+
+ 1522
+ 12
+ 20
+ 0
+
+
+ 1522
+ 13
+ 20
+ 0
+
+
+ 1522
+ 21
+ 20
+ 0
+
+
+ 1522
+ 23
+ 20
+ 0
+
+
+ 1522
+ 632
+ 20
+ 0
+
+
+ 1522
+ 633
+ 20
+ 0
+
+
+ 1522
+ 350
+ 20
+ 0
+
+
+ 1522
+ 624
+ 20
+ 0
+
+
+ 1522
+ 646
+ 20
+ 0
+
+
+ 1522
+ 651
+ 20
+ 0
+
+
+ 1522
+ 652
+ 20
+ 0
+
+
+ 1522
+ 653
+ 20
+ 0
+
+
+ 1522
+ 655
+ 20
+ 0
+
+
+ 1522
+ 662
+ 20
+ 0
+
+
+ 1522
+ 665
+ 20
+ 0
+
+
+ 1522
+ 713
+ 20
+ 0
+
+
+ 1522
+ 714
+ 20
+ 0
+
+
+ 1522
+ 749
+ 20
+ 0
+
+
+ 1522
+ 750
+ 20
+ 0
+
+
+ 1522
+ 751
+ 20
+ 0
+
+
+ 1522
+ 752
+ 20
+ 0
+
+
+ 1522
+ 755
+ 20
+ 0
+
+
+ 1522
+ 762
+ 20
+ 0
+
+
+ 1522
+ 782
+ 20
+ 0
+
+
+ 1522
+ 781
+ 20
+ 0
+
+
+ 1522
+ 787
+ 20
+ 0
+
+
+ 1522
+ 788
+ 20
+ 0
+
+
+ 1522
+ 790
+ 20
+ 0
+
+
+ 1522
+ 791
+ 20
+ 0
+
+
+ 1522
+ 792
+ 20
+ 0
+
+
+ 1522
+ 793
+ 20
+ 0
+
+
+ 1522
+ 795
+ 20
+ 0
+
+
+ 1522
+ 796
+ 20
+ 0
+
+
+ 1522
+ 797
+ 20
+ 0
+
+
+ 1522
+ 896
+ 20
+ 0
+
+
+ 1522
+ 1070
+ 20
+ 0
+
+
+ 1522
+ 1072
+ 20
+ 0
+
+
+ 1522
+ 1077
+ 20
+ 0
+
+
+ 1522
+ 1332
+ 20
+ 0
+
+
+ 1522
+ 1187
+ 20
+ 0
+
+
+ 1522
+ 671
+ 20
+ 0
+
+
+ 1522
+ 342
+ 20
+ 0
+
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index c29d03ad2..89471e7a9 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -45099,4 +45099,38 @@
+ -
+ 1522
+ KAC Masterkey
+ KAC Masterkey
+ The 12-gauge Masterkey shotgun can be mounted under standard rifles as a breaching tool when used with special ammo.
+ KAC Masterkey
+ Tired of having to pack an Assault Rifle and an additional Shotgun? With this specially adapted shotgun, you can carry 2 in 1!
+ 2
+ 512
+ 1
+ 1522
+ 3
+ 369
+ 24
+ 5
+ 1900
+ 5
+ 3
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+ 4
+ 1
+ 24
+ 100.0
+
+
+
+
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml
index 9a9e0d2aa..3cc33726d 100644
--- a/gamedir/Data-1.13/TableData/MercStartingGear.xml
+++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml
@@ -8095,6 +8095,7 @@
0
+ Breaching
0
293
0
@@ -8105,16 +8106,16 @@
294
0
0
- 775
+ 671
0
92
- 107
- 0
- 2
+ 1522
+ 97
+ 1
0
- 416
- 0
- 1
+ 415
+ 100
+ 2
0
994
91
@@ -8127,12 +8128,12 @@
213
89
1
- 0
- 0
- 0
- 0
- 0
- 0
+ 413
+ 100
+ 2
+ 531
+ 100
+ 2
0
0
0
@@ -8154,8 +8155,8 @@
0
0
0
- 0
- 0
+ 1098
+ 96
0
0
@@ -31112,6 +31113,7 @@
0
+ Breaching
0
285
93
@@ -31133,20 +31135,20 @@
100
1
0
- 631
- 99
+ 1522
+ 98
1
0
- 401
- 100
- 2
+ 0
+ 0
+ 0
0
- 0
- 0
- 0
- 0
- 0
- 0
+ 414
+ 100
+ 2
+ 415
+ 100
+ 2
0
0
0
diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml
index 8f5aa4137..1e0b9a940 100644
--- a/gamedir/Data-1.13/TableData/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Weapons.xml
@@ -13060,4 +13060,38 @@
87
7
+
+ 1522
+ KAC Masterkey
+ 5
+ 8
+ 5
+ 20
+ 10.41
+ 22
+ 36
+ 26
+ 4
+ 90
+ 200
+ 100
+ 85
+ 8
+ 435
+ 126
+ 103
+ 109
+ 157
+ 20
+ 16
+ 7
+ 10
+ 481
+ 20
+ 3
+ 9
+ 4000
+ 5000
+ 134
+
\ No newline at end of file
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index f64a5104c..bb869fd59 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -1757,11 +1757,21 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35
;******************************************************************************************************************************
; Should a 'thermometer' for guns and replacable barrels be displayed?
-OVERHEATING_DISPLAY_THERMOMETER = TRUE
+OVERHEATING_DISPLAY_THERMOMETER = FALSE
-; If a barrel is not in someone's inventory, it cools down a little bit better
+; Starting amount of red colour in the temperature bar. Must be in [0, 255]
+OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100
+
+; If a barrel is not in someone's inventory, it cools down a little bit better.
OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15
+; Should the temperature of all items lying on the ground in a sector be set to zero upon loading a different sector?
+; Due to engine limitations, the temperature will otherwise stay what I was when another sector was loaded.
+; This can be exploited, but why would you do that?
+; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are.
+OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = FALSE
+
+
;******************************************************************************************************************************
;******************************************************************************************************************************