[MIRROR] Begin clickcode attack_self fix (#12173)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

modular_chomp/code/game/objects/items/contraband.dm

@@ -7,6 +7,9 @@
 	w_class = ITEMSIZE_HUGE
 
 /obj/item/contraband/attack_self(mob/user)
+	. = ..(user)
+	if(.)
+		return TRUE
 	var/contraband = pick(
 		/obj/item/reagent_containers/glass/beaker/vial/macrocillin,
 		/obj/item/reagent_containers/glass/beaker/vial/microcillin,

modular_chomp/code/game/objects/items/devices/mind_binder.dm

@@ -17,9 +17,6 @@
 	usr.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	return
 
-/obj/item/mindbinder/attack_self(mob/living/user)
-	return
-
 /obj/item/mindbinder/proc/toggle_self_bind()
 	if(possessed_voice.len == 1)
 		to_chat(usr,span_warning("The device beeps a warning that there is already a mind loaded!"))

modular_chomp/code/game/objects/items/gunbox.dm

@@ -1,8 +1,12 @@
 /obj/item/gunbox/sec_officer
 	name = "lethal armament box"
 	desc = "A secure box containing a non-lethal sidearm."
+	variant_gunbox = TRUE
 
 /obj/item/gunbox/sec_officer/attack_self(mob/living/user)
+	. = ..(user)
+	if(.)
+		return TRUE
 	var/list/options = list()
 	options["Laser Pistol"] = list(/obj/item/gun/energy/gun, /obj/item/cell/device/weapon, /obj/item/cell/device/weapon)
 	options["Normal Pistol"] = list(/obj/item/gun/projectile/pistol, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact, /obj/item/ammo_magazine/m9mm/compact)

modular_chomp/code/modules/clothing/accessories/accessory.dm

@@ -14,9 +14,7 @@
 	var/slaveckey = null	//Ckey for system to check who is the person and ensure no abuse of system or errors
 	var/slaveflavor = null	//Description to show on the SPASM
 	var/slaveooc = null		//OOC text to show on the SPASM
-
-/obj/item/clothing/accessory/collar/casinoslave/attack_self(mob/user as mob)
-	//keeping it blank so people don't tag and reset collar status
+	special_collar = TRUE
 
 /obj/item/clothing/accessory/collar/holo/casinoslave_fake
 	name = "a Sentient Prize Collar"

modular_chomp/code/modules/clothing/accessories/modular_armor.dm

@@ -218,17 +218,8 @@
 	default_worn_icon = "groinpadU"
 
 ///helmet
-
-/obj/item/clothing/head/helmet/riot/modarm/attack_self(mob/user)
-	if(icon_state == src::icon_state)
-		icon_state = "modhelmup"
-		item_state = "modhelmup"
-		to_chat(user, span_notice("You raise the visor on the visored helmet."))
-	else
-		icon_state = src::icon_state
-		item_state = src::item_state
-		to_chat(user, span_notice("You lower the visor on the visored helmet."))
-	update_clothing_icon()
+/obj/item/clothing/head/helmet/riot/modarm
+	name_descriptor = "visored helmet"
 
 /obj/item/clothing/head/helmet/riot/modarm/killa
 	name = "striped visored helmet"
@@ -236,18 +227,6 @@
 	icon_state = "modhelm_killa"
 	item_state = "modhelm_killa"
 
-/obj/item/clothing/head/helmet/riot/modarm/killa/attack_self(mob/user)
-	if(icon_state == src::icon_state)
-		icon_state = "modhelm_killaup"
-		item_state = "modhelm_killaup"
-		to_chat(user, span_notice("You raise the visor on the visored helmet."))
-	else
-		icon_state = src::icon_state
-		item_state = src::item_state
-		to_chat(user, span_notice("You lower the visor on the visored helmet."))
-	update_clothing_icon()
-
-
 ///presets
 
 /obj/item/clothing/suit/armor/pcarrier/modarm/full

modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/defib.dm

@@ -19,6 +19,9 @@
 /obj/item/shockpaddles/standalone/rig/checked_use(var/charge_amt)
 	return 1
 
-/obj/item/shockpaddles/standalone/rig/attack_self()
+/obj/item/shockpaddles/standalone/rig/attack_self(mob/user)
+	. = ..(user)
+	if(.)
+		return TRUE
 	use_on_synthetic = !use_on_synthetic
 	to_chat(usr, span_notice("You switch the [src] to [use_on_synthetic ? "FBP" : "organic"] compatibility."))