"Jestographic Sequencer", a clown-exclusive traitor item & tweaks

code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm

@@ -20,7 +20,7 @@
 	#define COMPONENT_CANCEL_BLOB_ACT (1<<0)
 ///from base of atom/acid_act(): (acidpwr, acid_volume)
 #define COMSIG_ATOM_ACID_ACT "atom_acid_act"
-///from base of atom/emag_act(): (/mob/user)
+///from base of atom/emag_act(): (/mob/user, /obj/item/card/emag)
 #define COMSIG_ATOM_EMAG_ACT "atom_emag_act"
 ///! from base of atom/rad_act(intensity, collectable_radiation)
 #define COMSIG_ATOM_RAD_ACT "atom_rad_act"

code/__DEFINES/obj_flags.dm

@@ -11,6 +11,7 @@
 #define USES_TGUI				(1<<7)	//put on things that use tgui on ui_interact instead of custom/old UI.
 #define FROZEN					(1<<8)
 #define UNIQUE_REDESC			(1<<9) // can you customize the description of the thing?
+#define CMAGGED					(1<<10)
 
 // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support
 

code/_globalvars/bitfields.dm

@@ -33,6 +33,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"USES_TGUI" = USES_TGUI,
 		"FROZEN" = FROZEN,
 		"UNIQUE_REDESC" = UNIQUE_REDESC,
+    	"CMAGGED" = CMAGGED,
 		),
 	"datum_flags" = list(
 		"DF_USE_TAG" = DF_USE_TAG,

code/_onclick/ai.dm

@@ -131,14 +131,14 @@
 
 /* Airlocks */
 /obj/machinery/door/airlock/AICtrlClick() // Bolts doors
-	if(obj_flags & EMAGGED)
+	if((obj_flags & EMAGGED) || (obj_flags & CMAGGED))
 		return
 
 	toggle_bolt(usr)
 	add_hiddenprint(usr)
 
 /obj/machinery/door/airlock/AIAltClick() // Eletrifies doors.
-	if(obj_flags & EMAGGED)
+	if((obj_flags & EMAGGED) || (obj_flags & CMAGGED))
 		return
 
 	if(!secondsElectrified)
@@ -147,14 +147,14 @@
 		shock_restore(usr)
 
 /obj/machinery/door/airlock/AIShiftClick()  // Opens and closes doors!
-	if(obj_flags & EMAGGED)
+	if((obj_flags & EMAGGED) || (obj_flags & CMAGGED))
 		return
 
 	user_toggle_open(usr)
 	add_hiddenprint(usr)
 
 /obj/machinery/door/airlock/AICtrlShiftClick()  // Sets/Unsets Emergency Access Override
-	if(obj_flags & EMAGGED)
+	if((obj_flags & EMAGGED) || (obj_flags & CMAGGED))
 		return
 
 	toggle_emergency(usr)

code/game/atoms.dm

@@ -94,7 +94,6 @@
 	var/base_pixel_y = 0
 	///the base icon state used for anything that changes their icon state.
 	var/base_icon_state
-
 	///Mobs that are currently do_after'ing this atom, to be cleared from on Destroy()
 	var/list/targeted_by
 
@@ -798,10 +797,16 @@
 /**
   * Respond to an emag being used on our atom
   *
-  * Default behaviour is to send COMSIG_ATOM_EMAG_ACT and return
+  * Args:
+  * * mob/user: The mob that used the emag. Nullable.
+  * * obj/item/card/emag/emag_card: The emag that was used. Nullable.
+  *
+  * Returns:
+  * TRUE if the emag had any effect, falsey otherwise.
   */
-/atom/proc/emag_act()
-	SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT)
+/atom/proc/emag_act(mob/user, obj/item/card/emag/emag_card)
+	SHOULD_CALL_PARENT(FALSE) // Emag act should either be: overridden (no signal) or default (signal).
+	return (SEND_SIGNAL(src, COMSIG_ATOM_EMAG_ACT, user, emag_card))
 
 /**
   * Respond to a radioactive wave hitting this atom

code/game/machinery/Sleeper.dm

@@ -118,11 +118,12 @@
 	if(is_operational() && occupant)
 		open_machine()
 
-/obj/machinery/sleeper/emag_act(mob/user)
+/obj/machinery/sleeper/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	to_chat(user, span_danger("You disable the chemical injection inhibitors on the sleeper..."))
 	obj_flags |= EMAGGED
+	return TRUE
 
 /obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user)
 	if(user.stat || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser())

code/game/machinery/airlock_cycle_control.dm

@@ -786,12 +786,13 @@
 	. = ..()
 	update_cycle_icon()
 
-/obj/machinery/advanced_airlock_controller/emag_act(mob/user)
+/obj/machinery/advanced_airlock_controller/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	obj_flags |= EMAGGED
 	visible_message(span_warning("Sparks fly out of [src]!"), span_notice("You emag [src], disabling its safeties."))
 	playsound(src, "sparks", 50, 1)
+	return TRUE
 
 /obj/machinery/advanced_airlock_controller/obj_break(damage_flag)
 	..()

code/game/machinery/announcement_system.dm

@@ -160,18 +160,20 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 
 /obj/machinery/announcement_system/proc/act_up() //does funny breakage stuff
 	if(!obj_break()) // if badmins flag this unbreakable or its already broken
-		return
+		return FALSE
 
 	arrival = pick("#!@%ERR-34%2 CANNOT LOCAT@# JO# F*LE!", "CRITICAL ERROR 99.", "ERR)#: DA#AB@#E NOT F(*ND!")
 	newhead = pick("OV#RL()D: \[UNKNOWN??\] DET*#CT)D!", "ER)#R - B*@ TEXT F*O(ND!", "AAS.exe is not responding. NanoOS is searching for a solution to the problem.")
+	return TRUE
 
 /obj/machinery/announcement_system/emp_act(severity)
 	. = ..()
 	if(!(stat & (NOPOWER|BROKEN)) && !(. & EMP_PROTECT_SELF))
 		act_up()
 
-/obj/machinery/announcement_system/emag_act()
+
+/obj/machinery/announcement_system/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	obj_flags |= EMAGGED
-	act_up()
+	return act_up()

code/game/machinery/autolathe.dm

@@ -311,14 +311,15 @@
 	. = ..()
 	adjust_hacked(TRUE)
 
-/obj/machinery/autolathe/emag_act(mob/user)
+/obj/machinery/autolathe/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	obj_flags |= EMAGGED
 	if(!hacked)
 		adjust_hacked(TRUE)
 	playsound(src, "sparks", 75, TRUE, -1)
 	to_chat(user, span_notice("You use the cryptographic sequencer on [src]."))
+	return TRUE
 
 //Called when the object is constructed by an autolathe
 //Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes

code/game/machinery/buttons.dm

@@ -133,14 +133,15 @@
 	else
 		return ..()
 
-/obj/machinery/button/emag_act(mob/user)
+/obj/machinery/button/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	req_access = list()
 	req_one_access = list()
 	playsound(src, "sparks", 100, 1)
 	obj_flags |= EMAGGED
-
+	return TRUE
+
 /obj/machinery/button/attack_ai(mob/user)
 	if(!panel_open)
 		return attack_hand(user)

code/game/machinery/cloning.dm

@@ -435,14 +435,15 @@ GLOBAL_VAR_INIT(clones, 0)
 	else
 		return ..()
 
-/obj/machinery/clonepod/emag_act(mob/user)
+/obj/machinery/clonepod/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(!occupant)
-		return
+		return FALSE
 	to_chat(user, span_warning("You corrupt the genetic compiler."))
 	malfunction()
 	add_fingerprint(user)
 	log_cloning("[key_name(user)] emagged [src] at [AREACOORD(src)], causing it to malfunction.")
 	log_combat(user, src, "emagged", null, occupant ? "[occupant] inside, killing them via malfunction." : null)
+	return TRUE
 
 //Put messages in the connected computer's temp var for display.
 /obj/machinery/clonepod/proc/connected_message(message)

code/game/machinery/computer/apc_control.dm

@@ -181,12 +181,13 @@
 			var/setTo = target.operating ? "On" : "Off"
 			log_activity("Turned APC [target.area.name]'s breaker [setTo]")
 
-/obj/machinery/computer/apc_control/emag_act(mob/user)
+/obj/machinery/computer/apc_control/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	obj_flags |= EMAGGED
 	log_game("[key_name(user)] emagged [src] at [AREACOORD(src)]")
 	playsound(src, "sparks", 50, TRUE)
+	return TRUE
 
 /obj/machinery/computer/apc_control/proc/log_activity(log_text)
 	if(!should_log)

code/game/machinery/computer/arcade.dm

@@ -330,9 +330,9 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	return
 
 
-/obj/machinery/computer/arcade/battle/emag_act(mob/user)
+/obj/machinery/computer/arcade/battle/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	to_chat(user, span_warning("A mesmerizing Rhumba beat starts playing from the arcade machine's speakers!"))
 	temp = "If you die in the game, you die for real!"
 	player_hp = 30
@@ -341,16 +341,11 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	enemy_mp = 20
 	gameover = FALSE
 	blocked = FALSE
-
 	obj_flags |= EMAGGED
-
 	enemy_name = "Cuban Pete"
 	name = "Outbomb Cuban Pete"
-
-
 	updateUsrDialog()
-
-
+	return TRUE
 
 // *** THE ORION TRAIL ** //
 
@@ -1084,14 +1079,15 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	name = "The Orion Trail"
 	desc = "Learn how our ancestors planned to colonize Orion, and have fun in the process!"
 
-/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user)
+/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
-		return
+		return FALSE
 	to_chat(user, span_notice("You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode."))
 	name = "The Orion Trail: Realism Edition"
 	desc = "Learn how our ancestors planned to colonize Orion, and try not to die in the process!"
 	newgame()
 	obj_flags |= EMAGGED
+	return TRUE
 
 /mob/living/simple_animal/hostile/syndicate/ranged/smg/orion
 	name = "spaceport security"

code/game/machinery/computer/communications.dm

@@ -81,14 +81,15 @@
 	else
 		return ..()
 
-/obj/machinery/computer/communications/emag_act(mob/user)
-	if (obj_flags & EMAGGED)
-		return
+/obj/machinery/computer/communications/emag_act(mob/user, obj/item/card/emag/emag_card)
+	if(obj_flags & EMAGGED)
+		return FALSE
 	obj_flags |= EMAGGED
 	if (authenticated)
 		authorize_access = get_all_accesses()
 	to_chat(user, span_danger("You scramble the communication routing circuits!"))
 	playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
+	return TRUE
 
 /obj/machinery/computer/communications/ui_act(action, list/params)
 	var/static/list/approved_states = list(STATE_BUYING_SHUTTLE, STATE_CHANGING_STATUS, STATE_MAIN, STATE_MESSAGES)

code/game/machinery/computer/security.dm

@@ -846,7 +846,9 @@
 			//Cancel silicon alert after 1 minute
 			addtimer(CALLBACK(SILICON, TYPE_PROC_REF(/mob/living/silicon, cancelAlarm),"Burglar",src,alarmed), 600)
 
-/obj/machinery/computer/secure_data/emag_act(mob/user)
+/obj/machinery/computer/secure_data/emag_act(mob/user, obj/item/card/emag/emag_card)
+	if(logged_in) // What was the point then?
+		return FALSE
 	var/name
 	if(ishuman(user))
 		var/mob/living/carbon/human/human_user = user
@@ -855,18 +857,16 @@
 			name = "[ID.registered_name]"
 		else
 			name = "Unknown"
-
 	if(issilicon(user))
 		name = "[user.name]"
-
-	if(!logged_in)
-		logged_in = TRUE
-		to_chat(user, span_warning("You override [src]'s ID lock."))
-		trigger_alarm()
-		playsound(src, 'sound/effects/alert.ogg', 50, TRUE)
-		var/area/A = get_area(loc)
-		radio.talk_into(src, "Alert: security breach alarm triggered in [A.map_name]!! Unauthorized access by [name] of [src]!!", sec_freq)
-		radio.talk_into(src, "Alert: security breach alarm triggered in [A.map_name]!! Unauthorized access by [name] of [src]!!", command_freq)
+	logged_in = TRUE
+	to_chat(user, span_warning("You override [src]'s ID lock."))
+	trigger_alarm()
+	playsound(src, 'sound/effects/alert.ogg', 50, TRUE)
+	var/area/A = get_area(loc)
+	radio.talk_into(src, "Alert: security breach alarm triggered in [A.map_name]!! Unauthorized access by [name] of [src]!!", sec_freq)
+	radio.talk_into(src, "Alert: security breach alarm triggered in [A.map_name]!! Unauthorized access by [name] of [src]!!", command_freq)
+	return TRUE
 
 /obj/machinery/computer/secure_data/emp_act(severity)
 	. = ..()

code/game/machinery/decontamination.dm

@@ -169,19 +169,20 @@
 	s.start()
 	electrocute_mob(user, src, src, 1, TRUE)
 
-/obj/machinery/decontamination_unit/emag_act(mob/user)
+/obj/machinery/decontamination_unit/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
 		to_chat(user, span_warning("[src] has no functional safeties to emag."))
-		return
+		return FALSE
 	if(!state_open)
 		if(!panel_open)
 			to_chat(user, span_warning("Open the panel first."))
-			return
+			return FALSE
 	else
-		return
+		return FALSE
 	to_chat(user, span_warning("You short out [src]'s safeties."))
 	uv_emagged = TRUE
 	obj_flags |= EMAGGED
+	return TRUE
 
 /obj/machinery/decontamination_unit/relaymove(mob/user)
 	if(locked)
@@ -249,7 +250,7 @@
 /obj/machinery/decontamination_unit/examine(mob/user)
 	. = ..()
 	if(obj_flags & EMAGGED)
-		. += span_warning("Its maintenance panel is smoking slightly.")
+		. += span_warning("The maintenance panel is smoking slightly.")
 	if(in_range(user, src) || isobserver(user))
 		if (contents.len >= max_n_of_items)
 			. += span_notice("The status display reads: <b>Inventory full!</b> Please remove items or upgrade the parts of this storage unit.")