diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 1ea69c7462..f74d380b8a 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -97,6 +97,8 @@
 	var/override_alerts = FALSE //If it is overriding other alerts of the same type
 	var/mob/owner //Alert owner
 
+	/// Boolean. If TRUE, the Click() proc will attempt to Click() on the master first if there is a master.
+	var/click_master = TRUE
 
 /atom/movable/screen/alert/MouseEntered(location,control,params)
 	if(!QDELETED(src))
@@ -809,15 +811,17 @@ so as to remain in compliance with the most up-to-date laws."
 
 /atom/movable/screen/alert/Click(location, control, params)
 	if(!usr || !usr.client)
-		return
+		return FALSE
+	if(usr != owner)
+		return FALSE
 	var/paramslist = params2list(params)
 	if(paramslist["shift"]) // screen objects don't do the normal Click() stuff so we'll cheat
 		to_chat(usr, "<span class='boldnotice'>[name]</span> - <span class='info'>[desc]</span>")
-		return
-	if(usr != owner)
-		return
-	if(master)
+		return FALSE
+	if(master && click_master)
 		return usr.client.Click(master, location, control, params)
+	
+	return TRUE
 
 /atom/movable/screen/alert/Destroy()
 	. = ..()
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 291761a197..53ba29622e 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -168,4 +168,4 @@
 
 /datum/status_effect/offering/secret_handshake
 	id = "secret_handshake"
-	alert_type = /atom/movable/screen/alert/give/secret_handshake
+	give_alert_type = /atom/movable/screen/alert/give/secret_handshake
diff --git a/code/modules/antagonists/gang/cellphone.dm b/code/modules/antagonists/gang/cellphone.dm
index 4598d8547c..7ba3a76d95 100644
--- a/code/modules/antagonists/gang/cellphone.dm
+++ b/code/modules/antagonists/gang/cellphone.dm
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(gangster_cell_phones)
 	var/gang_id = "Grove Street Families"
 	var/activated = FALSE
 
-/obj/item/gangster_cellphone/Initialize(mapload)
+/obj/item/gangster_cellphone/Initialize()
 	. = ..()
 	GLOB.gangster_cell_phones += src
 	become_hearing_sensitive()
@@ -58,4 +58,3 @@ GLOBAL_LIST_EMPTY(gangster_cell_phones)
 		if(HAS_TRAIT(cellphone_hearer, TRAIT_DEAF))
 			continue
 		to_chat(cellphone_hearer, span_gangradio("<b>[speaker.name]</b> \[CELL: [gang_id]\] says, \"[message]\""))
-