[MIRROR] *smacks table* Hot Damn! (#3734)

* *smacks table* Hot Damn! (#57269)

* *smacks table* Hot Damn!

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>

code/modules/cargo/coupon.dm

@@ -30,7 +30,7 @@
 		discount_pct_off = text2num(discount_pct_off)
 		name = "coupon - [round(discount_pct_off * 100)]% off [initial(discounted_pack.name)]"
 
-/obj/item/coupon/attack_obj(obj/O, mob/living/user)
+/obj/item/coupon/attack_obj(obj/O, mob/living/user, params)
 	if(!istype(O, /obj/machinery/computer/cargo))
 		return ..()
 	if(discount_pct_off == COUPON_OMEN)

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -65,7 +65,7 @@
 		Die()
 
 /obj/item/clothing/mask/facehugger/attackby(obj/item/O, mob/user, params)
-	return O.attack_obj(src, user)
+	return O.attack_obj(src, user, params)
 
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 /obj/item/clothing/mask/facehugger/attack_hand(mob/user, list/modifiers)

code/modules/mob/living/carbon/emote.dm

@@ -117,6 +117,7 @@
 	key = "slap"
 	key_third_person = "slaps"
 	hands_use_check = TRUE
+	cooldown = 3 SECONDS // to prevent endless table slamming
 
 /datum/emote/living/carbon/slap/run_emote(mob/user, params, type_override, intentional)
 	. = ..()

code/modules/power/lighting.dm

@@ -995,7 +995,7 @@
 	..()
 	shatter()
 
-/obj/item/light/attack_obj(obj/O, mob/living/user)
+/obj/item/light/attack_obj(obj/O, mob/living/user, params)
 	..()
 	shatter()
 

code/modules/projectiles/gun.dm

@@ -394,7 +394,7 @@
 			return ..()
 	return
 
-/obj/item/gun/attack_obj(obj/O, mob/living/user)
+/obj/item/gun/attack_obj(obj/O, mob/living/user, params)
 	if(user.combat_mode)
 		if(bayonet)
 			O.attackby(bayonet, user)