diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index b900fd9c5..06d78b4ed 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -2339,6 +2339,19 @@ FACILITY_DANGER_RATE = 50
ADDITIONAL_REPAIR_MODE = FALSE
+;------------------------------------------------------------------------------------------------------------------------------
+; advanced repair/dirt system
+;------------------------------------------------------------------------------------------------------------------------------
+
+; determines wether a gun can suffer permanent damage that cannot be repaired other by local smiths.
+ADVANCED_REPAIR = FALSE
+
+; allows a gun to get dirty when used, thereby increasing the chance of weapon jamming
+DIRT_SYSTEM = FALSE
+
+; every trun, a gun suffers a dirt increase equal to a singleshot dirt increase divided by this number
+SECTOR_DIRT_DIVIDER = 1000
+
;******************************************************************************************************************************
; Set how to handle Skyrider "hot LZ" options
;
diff --git a/gamedir/Data/Laptop/SORTBY.STI b/gamedir/Data/Laptop/SORTBY.STI
new file mode 100644
index 000000000..aa2eb3c06
Binary files /dev/null and b/gamedir/Data/Laptop/SORTBY.STI differ
diff --git a/gamedir/Data/TableData/Clothes.xml b/gamedir/Data/TableData/Clothes.xml
new file mode 100644
index 000000000..85253ac8c
--- /dev/null
+++ b/gamedir/Data/TableData/Clothes.xml
@@ -0,0 +1,137 @@
+
+
+
+
+
+ 1
+ YELLOWVEST
+ YELLOWVEST
+
+
+
+ 2
+ BLACKSHIRT
+ BLACKSHIRT
+
+
+
+ 3
+ REDVEST
+ REDVEST
+
+
+
+ 4
+ GREENVEST
+ GREENVEST
+
+
+
+ 5
+ JEANVEST
+ JEANVEST
+
+
+
+ 6
+ BLUEVEST
+ BLUEVEST
+
+
+
+ 7
+ grey shirt
+ greyVEST
+
+
+
+ 8
+ light green
+ GYELLOWSHIRT
+
+
+
+ 9
+ WHITEVEST
+ WHITEVEST
+
+
+
+ 10
+ PURPLESHIRT
+ PURPLESHIRT
+
+
+
+ 11
+ BROWNVEST
+ BROWNVEST
+
+
+
+ 12
+ Army trousers
+ GREENPANTS
+
+
+
+ 13
+ BLACKPANTS
+ BLACKPANTS
+
+
+
+ 14
+ BEIGEPANTS
+ BEIGEPANTS
+
+
+
+ 15
+ TANPANTS
+ TANPANTS
+
+
+
+ 16
+ JEANPANTS
+ JEANPANTS
+
+
+
+ 17
+ Bluejeans
+ BLUEPANTS
+
+
+
+ 18
+ white t-shirt and jeans
+ WHITEVEST
+ BLUEPANTS
+
+
+
\ No newline at end of file
diff --git a/gamedir/Data/TableData/RandomItem.xml b/gamedir/Data/TableData/RandomItem.xml
new file mode 100644
index 000000000..5036987af
--- /dev/null
+++ b/gamedir/Data/TableData/RandomItem.xml
@@ -0,0 +1,435 @@
+
+
+
+ 0
+ blank
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 1
+ vanilla handguns
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 0
+ 0
+
+
+ 2
+ AR-15 assault rifles
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 12
+ 23
+ 632
+ 633
+ 763
+ 796
+ 797
+ 1332
+ 0
+ 0
+
+
+ 3
+ HK assault rifles
+ 12
+ 14
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 13
+ 21
+ 29
+ 30
+ 662
+ 667
+ 1066
+ 1070
+ 1072
+ 1077
+
+
+ 4
+ FN assault rifles
+ 11
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 28
+ 646
+ 647
+ 648
+ 653
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 5
+ AKs, 47-based
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 26
+ 347
+ 612
+ 613
+ 615
+ 708
+ 0
+ 0
+ 0
+ 0
+
+
+ 6
+ AKs, 74-based
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 25
+ 614
+ 785
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 7
+ AKs, very new
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 606
+ 607
+ 608
+ 609
+ 610
+ 611
+ 602
+ 602
+ 616
+ 0
+
+
+ 8
+ other NATO ARs 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 20
+ 24
+ 331
+ 27
+ 332
+ 605
+ 624
+ 629
+ 655
+ 656
+
+
+ 9
+ other WP ARs
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 349
+ 617
+ 659
+ 660
+ 782
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 10
+ SIG assault rifles
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 350
+ 712
+ 713
+ 714
+ 715
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 11
+ FN SCAR
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 651
+ 652
+ 787
+ 788
+ 790
+ 791
+ 792
+ 793
+ 0
+ 0
+
+
+ 12
+ HK G36
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 664
+ 665
+ 666
+ 755
+ 756
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 13
+ other NATO ARs 2
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 691
+ 704
+ 742
+ 743
+ 757
+ 781
+ 789
+ 1195
+ 896
+ 1065
+
+
+ 14
+ XM-Series
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 748
+ 749
+ 750
+ 751
+ 752
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 15
+ NATO assault rifles
+ 2
+ 3
+ 4
+ 8
+ 10
+ 13
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 16
+ WP assault rifles
+ 5
+ 6
+ 7
+ 8
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+ 17
+ Assault rifles
+ 15
+ 16
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
\ No newline at end of file