diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 413f93f02f9..0cb3430fd07 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -89,7 +89,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "bike_horn"
 	item_state = "bike_horn"
-	hitsound = 'sound/items/bikehorn.ogg'
+	hitsound = null
 	throwforce = 3
 	w_class = 1.0
 	throw_speed = 3
@@ -97,12 +97,26 @@
 	attack_verb = list("HONKED")
 	var/spam_flag = 0
 	var/honk_sound = 'sound/items/bikehorn.ogg'
+	var/cooldowntime = 20
 
-/obj/item/weapon/bikehorn/attack_self(mob/user as mob)
-	if (spam_flag == 0)
+/obj/item/weapon/bikehorn/attack(mob/living/carbon/M, mob/living/carbon/user)
+	if(!spam_flag)
+		playsound(loc, honk_sound, 50, 1, -1) //plays instead of tap.ogg!
+	return ..()
+
+/obj/item/weapon/bikehorn/attack_self(mob/user)
+	if(!spam_flag)
 		spam_flag = 1
 		playsound(src.loc, honk_sound, 50, 1)
 		src.add_fingerprint(user)
-		spawn(20)
+		spawn(cooldowntime)
 			spam_flag = 0
-	return
\ No newline at end of file
+	return
+
+
+/obj/item/weapon/bikehorn/airhorn
+	name = "air horn"
+	desc = "Damn son, where'd you find this?"
+	icon_state = "air_horn"
+	honk_sound = 'sound/items/AirHorn2.ogg'
+	cooldowntime = 50
\ No newline at end of file
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 0d44c405cb7..89b2b5f23c7 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -331,7 +331,6 @@
 	icon_state = "rubberducky"
 	item_state = "rubberducky"
 	attack_verb = list("quacked", "squeaked")
-	hitsound = 'sound/items/squeaktoy.ogg'
 	honk_sound = 'sound/items/squeaktoy.ogg' //credit to DANMITCH3LL of freesound for this
 
 
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index b2fbfcc736d..71d47e0012d 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -10,7 +10,7 @@
 	materials = list("$metal" = 50, "$glass" = 50)
 	build_path = /obj/item/clothing/glasses/hud/health
 	category = list("Equipment")
-	
+
 /datum/design/magboots
 	name = "Magnetic Boots"
 	desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
@@ -20,7 +20,7 @@
 	materials = list("$metal" = 4500, "$silver" = 1500, "$gold" = 2500)
 	build_path = /obj/item/clothing/shoes/magboots
 	category = list("Equipment")
-	
+
 /datum/design/night_vision_goggles
 	name = "Night Vision Goggles"
 	desc = "Goggles that let you see through darkness unhindered."
@@ -40,7 +40,7 @@
 	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
 	build_path = /obj/item/clothing/glasses/hud/health/night
 	category = list("Equipment")
-	
+
 /datum/design/security_hud_night
 	name = "Night Vision Security HUD"
 	desc = "A heads-up display which provides id data and vision in complete darkness."
@@ -59,8 +59,8 @@
 	build_type = PROTOLATHE
 	materials = list("$metal" = 300, "$glass" = 400, "$plasma" = 250, "$uranium" = 1000)
 	build_path = /obj/item/clothing/glasses/meson/night
-	category = list("Equipment")	
-	
+	category = list("Equipment")
+
 /datum/design/mesons
 	name = "Optical Meson Scanners"
 	desc = "Used for seeing walls, floors, and stuff through anything."
@@ -79,4 +79,14 @@
 	build_type = PROTOLATHE
 	materials = list("$metal" = 50, "$glass" = 50)
 	build_path = /obj/item/clothing/glasses/hud/security
+	category = list("Equipment")
+
+/datum/design/air_horn
+	name = "Air Horn"
+	desc = "Damn son, where'd you find this?"
+	id = "air_horn"
+	req_tech = list("materials" = 2, "engineering" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 4000, "$bananium" = 1000)
+	build_path = /obj/item/weapon/bikehorn/airhorn
 	category = list("Equipment")
\ No newline at end of file
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 46832121244..819ce7883e4 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/sound/items/AirHorn2.ogg b/sound/items/AirHorn2.ogg
new file mode 100644
index 00000000000..37ee8640af9
Binary files /dev/null and b/sound/items/AirHorn2.ogg differ