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

code/game/objects/effects/spawners/lootdrop.dm

@@ -151,6 +151,7 @@
 				/obj/item/implanter/storage = 1,
 				/obj/item/toy/cards/deck/syndicate = 2,
 				/obj/item/storage/secure/briefcase/syndie = 2,
+				/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2,
 				"" = 70
 				)
 

code/game/objects/items.dm

@@ -310,6 +310,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 		return ..()
 
 /obj/item/proc/hit_reaction(mob/living/carbon/human/owner, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args)
 	if(prob(final_block_chance))
 		owner.visible_message("<span class='danger'>[owner] blocks [attack_text] with [src]!</span>")
 		return 1
@@ -324,6 +325,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 		A.Remove(user)
 	if(flags & DROPDEL)
 		qdel(src)
+	SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user)
 
 // called just as an item is picked up (loc is not yet changed)
 /obj/item/proc/pickup(mob/user)
@@ -351,6 +353,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 // for items that can be placed in multiple slots
 // note this isn't called during the initial dressing of a player
 /obj/item/proc/equipped(var/mob/user, var/slot)
+	SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot)
 	for(var/X in actions)
 		var/datum/action/A = X
 		if(item_action_slot_check(slot, user)) //some items only give their actions buttons when in a specific slot.
@@ -498,6 +501,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 
 /obj/item/throw_impact(atom/A)
 	if(A && !QDELETED(A))
+		SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, A)
 		var/itempush = 1
 		if(w_class < WEIGHT_CLASS_BULKY)
 			itempush = 0 // too light to push anything
@@ -548,6 +552,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	return I == src
 
 /obj/item/Crossed(atom/movable/AM)
+	. = ..()
 	if(prob(trip_chance) && ishuman(AM))
 		var/mob/living/carbon/human/H = AM
 		on_trip(H)
@@ -558,3 +563,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 
 /obj/item/attack_hulk(mob/living/carbon/human/user)
 	return FALSE
+
+/obj/item/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user) //handles block for CQC
+	if(target.check_block())
+		target.visible_message("<span class='danger'>[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!</span>",
+					"<span class='userdanger'>You block the attack!</span>")
+		user.Stun(2)
+		return TRUE

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

code/game/objects/structures/watercloset.dm

@@ -507,10 +507,8 @@
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky"
 	item_state = "rubberducky"
+	honk_sounds = list('sound/items/squeaktoy.ogg' = 1)
 	attack_verb = list("quacked", "squeaked")
-	honk_sound = 'sound/items/squeaktoy.ogg' //credit to DANMITCH3LL of freesound for this
-
-
 
 /obj/structure/sink
 	name = "sink"