Merge remote-tracking branch 'upstream/master' into discounts

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -10,6 +10,7 @@
 	var/translate_binary = FALSE
 	var/translate_hive = FALSE
 	var/syndie = FALSE
+	var/change_voice = FALSE
 	var/list/channels = list()
 
 
@@ -20,7 +21,7 @@
 	channels = list("Syndicate" = 1)
 	origin_tech = "syndicate=1;engineering=3;bluespace=2"
 	syndie = TRUE //Signifies that it de-crypts Syndicate transmissions
-	var/change_voice = TRUE
+	change_voice = TRUE
 	var/fake_name = "Agent ALERT_A_CODER"
 	var/static/list/fakename_list
 

code/game/objects/items/weapons/clown_items.dm

@@ -18,35 +18,21 @@
 	hitsound = null
 	throwforce = 3
 	w_class = WEIGHT_CLASS_TINY
+	var/list/honk_sounds = list('sound/items/bikehorn.ogg' = 1)
 	throw_speed = 3
 	throw_range = 15
 	attack_verb = list("HONKED")
-	var/spam_flag = 0
-	var/honk_sound = 'sound/items/bikehorn.ogg'
-	var/cooldowntime = 20
-
-/obj/item/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/bikehorn/attack_self(mob/user)
-	if(!spam_flag)
-		spam_flag = 1
-		playsound(src.loc, honk_sound, 50, 1)
-		src.add_fingerprint(user)
-		spawn(cooldowntime)
-			spam_flag = 0
-	return
 
+/obj/item/bikehorn/Initialize()
+	. = ..()
+	AddComponent(/datum/component/squeak, honk_sounds, 50)
 
 /obj/item/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
 	origin_tech = "materials=4;engineering=4"
+	honk_sounds = list('sound/items/airhorn2.ogg' = 1)
 
 /obj/item/bikehorn/golden
 	name = "golden bike horn"
@@ -63,11 +49,10 @@
 	..()
 
 /obj/item/bikehorn/golden/proc/flip_mobs(mob/living/carbon/M, mob/user)
-	if(!spam_flag)
-		var/turf/T = get_turf(src)
-		for(M in ohearers(7, T))
-			if(istype(M, /mob/living/carbon/human))
-				var/mob/living/carbon/human/H = M
-				if(!H.can_hear())
-					continue
-			M.emote("flip")
+	var/turf/T = get_turf(src)
+	for(M in ohearers(7, T))
+		if(istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			if(!H.can_hear())
+				continue
+		M.emote("flip")

code/game/objects/items/weapons/storage/firstaid.dm

@@ -158,6 +158,28 @@
 /obj/item/storage/firstaid/adv/empty
 	empty = 1
 
+/obj/item/storage/firstaid/machine
+	name = "machine repair kit"
+	desc = "A kit that contains supplies to repair IPCs on the go."
+	icon_state = "machinefirstaid"
+	item_state = "firstaid-machine"
+	med_bot_skin = "machine"
+
+/obj/item/storage/firstaid/machine/New()
+	..()
+	if(empty)
+		return
+	new /obj/item/weldingtool(src)
+	new /obj/item/stack/cable_coil(src)
+	new /obj/item/stack/cable_coil(src)
+	new /obj/item/stack/cable_coil(src)
+	new /obj/item/reagent_containers/food/drinks/oilcan/full(src)
+	new /obj/item/robotanalyzer(src)
+
+/obj/item/storage/firstaid/machine/empty
+	empty = 1
+
+
 /obj/item/storage/firstaid/tactical
 	name = "first-aid kit"
 	icon_state = "bezerk"

code/game/objects/items/weapons/stunbaton.dm

@@ -166,6 +166,8 @@
 
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
+		if(check_martial_counter(L, user))
+			return
 		if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
 			playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
 			return