diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index dbc3600e5dd..b1b07164e57 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -4,7 +4,7 @@ pixel_y = 20;
#define PRESET_SOUTH \
dir = SOUTH; \
-pixel_y = -6;
+pixel_y = -2;
#define PRESET_WEST \
dir = WEST; \
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index 11120702657..bccb17704f2 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -33,6 +33,7 @@
use_sound = 'sound/items/storage/toolbox.ogg'
drop_sound = 'sound/items/drop/toolbox.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
+ rustle_sound = 'sound/items/rustle/toolbox.ogg'
/obj/item/storage/briefcase/nt
name = "\improper NT briefcase"
diff --git a/code/game/objects/items/weapons/storage/pill_bottle.dm b/code/game/objects/items/weapons/storage/pill_bottle.dm
index 378401015ee..30b6da75758 100644
--- a/code/game/objects/items/weapons/storage/pill_bottle.dm
+++ b/code/game/objects/items/weapons/storage/pill_bottle.dm
@@ -13,6 +13,7 @@
use_sound = 'sound/items/storage/pillbottle.ogg'
drop_sound = 'sound/items/drop/pillbottle.ogg'
pickup_sound = 'sound/items/pickup/pillbottle.ogg'
+ rustle_sound = 'sound/items/pickup/pillbottle.ogg'
max_storage_space = DEFAULT_BOX_STORAGE
/obj/item/storage/pill_bottle/attack_self(mob/living/user)
diff --git a/code/game/objects/structures/machinery/biogenerator.dm b/code/game/objects/structures/machinery/biogenerator.dm
index 42824879b73..e9b97eff581 100644
--- a/code/game/objects/structures/machinery/biogenerator.dm
+++ b/code/game/objects/structures/machinery/biogenerator.dm
@@ -124,7 +124,8 @@ FOODSTUFFS
/singleton/biorecipe/food/bio_vitamin
name = "Flavored Vitamin"
object = /obj/item/reagent_containers/pill/bio_vitamin
- amount = list(1,5,10,25,50)
+ // Pill bottles can at most hold 14 pills
+ amount = list(1,3,5,10,14)
/singleton/biorecipe/food/liquidfood
name = "Food Ration"
diff --git a/code/game/objects/structures/machinery/doors/airlock.dm b/code/game/objects/structures/machinery/doors/airlock.dm
index f38d1a04bf8..9a7530daa70 100644
--- a/code/game/objects/structures/machinery/doors/airlock.dm
+++ b/code/game/objects/structures/machinery/doors/airlock.dm
@@ -1089,13 +1089,13 @@ About the new airlock wires panel:
stripe_overlay = new(stripe_file)
stripe_overlay.Blend(stripe_color, ICON_MULTIPLY)
SSicon_cache.airlock_icon_cache["[ikey]"] = stripe_overlay
- if(!glass)
- var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe"
- stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"]
- if(!stripe_filling_overlay)
- stripe_filling_overlay = new(stripe_fill_file)
- stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY)
- SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay
+
+ var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe"
+ stripe_filling_overlay = SSicon_cache.airlock_icon_cache["[ikey2]"]
+ if(!stripe_filling_overlay)
+ stripe_filling_overlay = new(stripe_fill_file)
+ stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY)
+ SSicon_cache.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay
if(arePowerSystemsOn())
switch(state)
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 2f7e84d50e9..927e6c22348 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -90,8 +90,7 @@
if(href_list["read"])
var/obj/item/paper/P = locate(href_list["read"])
if((P && P.loc == src))
- usr << browse("[P.name][P.info]", "window=[P.name]")
- onclose(usr, "[P.name]")
+ P.show_content(usr)
return
/obj/structure/noticeboard/command
diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm
index 75c69436e4d..83d8ea9f12a 100644
--- a/code/modules/client/preference_setup/loadout/items/augments.dm
+++ b/code/modules/client/preference_setup/loadout/items/augments.dm
@@ -51,6 +51,8 @@
path = /obj/item/organ/internal/augment/tool/combitool
cost = 5
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+ // Vaurca get a vaurca specific version of this
+ whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_UNATHI)
/datum/gear/augment/combitool/New()
..()
diff --git a/code/modules/clothing/head/wide_hats.dm b/code/modules/clothing/head/wide_hats.dm
index 9d924c4440f..be1c803c7a2 100644
--- a/code/modules/clothing/head/wide_hats.dm
+++ b/code/modules/clothing/head/wide_hats.dm
@@ -52,11 +52,13 @@
item_state = "boonie"
build_from_parts = TRUE
worn_overlay = "over"
+ sprite_sheets = null
/obj/item/clothing/head/bucket/boonie/camo
icon_state = "camo_boonie"
item_state = "camo_boonie"
has_accents = TRUE
+ sprite_sheets = null
/obj/item/clothing/head/fedora
name = "fedora"
diff --git a/code/modules/detectivework/tools/crimekit.dm b/code/modules/detectivework/tools/crimekit.dm
index 2b4d4a7957f..d79ce2aff3a 100644
--- a/code/modules/detectivework/tools/crimekit.dm
+++ b/code/modules/detectivework/tools/crimekit.dm
@@ -11,6 +11,7 @@
use_sound = 'sound/items/storage/toolbox.ogg'
drop_sound = 'sound/items/drop/toolbox.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
+ rustle_sound = 'sound/items/rustle/toolbox.ogg'
/obj/item/storage/briefcase/crimekit/fill()
..()
diff --git a/html/changelogs/TGWCleansUp.yml b/html/changelogs/TGWCleansUp.yml
new file mode 100644
index 00000000000..f0f984a2489
--- /dev/null
+++ b/html/changelogs/TGWCleansUp.yml
@@ -0,0 +1,14 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+ - bugfix: "Fixed the taj sprites for the bucket hat, boonie hat and camo boonie hat."
+ - bugfix: "Fixed noticeboard not formatting certain symbols correctly."
+ - bugfix: "Fixed pill bottle sound when inserting items."
+ - bugfix: "Fixed the overflow of vitamins from biogenerators."
+ - bugfix: "Fixed the sound from the investigator crime scene kit and aluminium briefcase when inserting items."
+ - bugfix: "Fixed intercoms on south walls were too far in on the walls."
+ - bugfix: "Fixed the stripes disappearing briefly when a glass airlock denied access."
+ - bugfix: "Fixed the missing wall pharmacy vending machine sprite when vending."
+ - bugfix: "Fixed vaurca having access to the base combi-tool. They have their own in the loadout, they should be using that."
diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi
index f5ea1081364..96fd33fe36b 100644
Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 889b5180eec..4489b38921c 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ