Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459

[MIRROR] Clown Ops

code/modules/antagonists/_common/antag_spawner.dm

@@ -73,7 +73,7 @@
 	C.prefs.copy_to(M)
 	M.key = C.key
 	var/datum/mind/app_mind = M.mind
-	
+
 	var/datum/antagonist/wizard/apprentice/app = new()
 	app.master = user
 	app.school = kind
@@ -145,6 +145,26 @@
 		M.mind.add_antag_datum(new_op,creator_op.nuke_team)
 		M.mind.special_role = "Nuclear Operative"
 
+//////CLOWN OP
+/obj/item/antag_spawner/nuke_ops/clown
+	name = "clown operative teleporter"
+	desc = "A single-use teleporter designed to quickly reinforce clown operatives in the field."
+
+/obj/item/antag_spawner/nuke_ops/clown/spawn_antag(client/C, turf/T, kind, datum/mind/user)
+	var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
+	C.prefs.copy_to(M)
+	M.key = C.key
+
+	var/datum/antagonist/nukeop/clownop/new_op = new /datum/antagonist/nukeop/clownop()
+	new_op.send_to_spawnpoint = FALSE
+	new_op.nukeop_outfit = /datum/outfit/syndicate/clownop/no_crystals
+
+	var/datum/antagonist/nukeop/creator_op = user.has_antag_datum(/datum/antagonist/nukeop/clownop,TRUE)
+	if(creator_op)
+		M.mind.add_antag_datum(new_op, creator_op.nuke_team)
+		M.mind.special_role = "Clown Operative"
+
+
 //////SYNDICATE BORG
 /obj/item/antag_spawner/nuke_ops/borg_tele
 	name = "syndicate cyborg teleporter"
@@ -187,7 +207,7 @@
 	R.real_name = R.name
 
 	R.key = C.key
-	
+
 	var/datum/antagonist/nukeop/new_borg = new()
 	new_borg.send_to_spawnpoint = FALSE
 	R.mind.add_antag_datum(new_borg,creator_op.nuke_team)

code/modules/antagonists/nukeop/clownop.dm

@@ -0,0 +1,25 @@
+
+/datum/antagonist/nukeop/clownop
+	name = "Clown Operative"
+	roundend_category = "clown operatives"
+	antagpanel_category = "ClownOp"
+	nukeop_outfit = /datum/outfit/syndicate/clownop
+
+/datum/antagonist/nukeop/leader/clownop
+	name = "Clown Operative Leader"
+	roundend_category = "clown operatives"
+	antagpanel_category = "ClownOp"
+	nukeop_outfit = /datum/outfit/syndicate/clownop/leader
+
+/datum/antagonist/nukeop/leader/clownop/give_alias()
+	title = pick("Head Honker", "Slipmaster", "Clown King", "Honkbearer")
+	if(nuke_team && nuke_team.syndicate_name)
+		owner.current.real_name = "[nuke_team.syndicate_name] [title]"
+	else
+		owner.current.real_name = "Syndicate [title]"
+
+/datum/antagonist/nukeop/clownop/admin_add(datum/mind/new_owner,mob/admin)
+	new_owner.assigned_role = "Clown Operative"
+	new_owner.add_antag_datum(src)
+	message_admins("[key_name_admin(admin)] has clown op'ed [new_owner.current].")
+	log_admin("[key_name(admin)] has clown op'ed [new_owner.current].")

code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm

@@ -15,6 +15,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
 			Such a brazen move will attract the attention of powerful benefactors within the Syndicate, who will supply your team with a massive amount of bonus telecrystals.  \
 			Must be used within five minutes, or your benefactors will lose interest."
 	var/declaring_war = FALSE
+	var/uplink_type = /obj/item/device/radio/uplink/nuclear
 
 /obj/item/device/nuclear_challenge/attack_self(mob/living/user)
 	if(!check_allowed(user))
@@ -59,7 +60,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
 	for(var/obj/machinery/computer/camera_advanced/shuttle_docker/D in GLOB.jam_on_wardec)
 		D.jammed = TRUE
 
-	new /obj/item/device/radio/uplink/nuclear(get_turf(user), user.key, CHALLENGE_TELECRYSTALS)
+	new uplink_type(get_turf(user), user.key, CHALLENGE_TELECRYSTALS)
 	CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
 	SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)
 
@@ -85,6 +86,9 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
 			return FALSE
 	return TRUE
 
+/obj/item/device/nuclear_challenge/clownops
+	uplink_type = /obj/item/device/radio/uplink/clownop
+
 #undef CHALLENGE_TELECRYSTALS
 #undef CHALLENGE_TIME_LIMIT
 #undef CHALLENGE_MIN_PLAYERS

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -1,16 +1,3 @@
-#define NUKESTATE_INTACT		5
-#define NUKESTATE_UNSCREWED		4
-#define NUKESTATE_PANEL_REMOVED		3
-#define NUKESTATE_WELDED		2
-#define NUKESTATE_CORE_EXPOSED	1
-#define NUKESTATE_CORE_REMOVED	0
-
-#define NUKE_OFF_LOCKED		0
-#define NUKE_OFF_UNLOCKED	1
-#define NUKE_ON_TIMING		2
-#define NUKE_ON_EXPLODING	3
-
-
 /obj/machinery/nuclearbomb
 	name = "nuclear fission explosive"
 	desc = "You probably shouldn't stick around to see if this is armed."
@@ -59,9 +46,8 @@
 		set_safety()
 	GLOB.poi_list -= src
 	GLOB.nuke_list -= src
-	if(countdown)
-		qdel(countdown)
-	countdown = null
+	QDEL_NULL(countdown)
+	QDEL_NULL(core)
 	. = ..()
 
 /obj/machinery/nuclearbomb/examine(mob/user)
@@ -459,11 +445,13 @@
 
 	//Cinematic
 	SSticker.mode.OnNukeExplosion(off_station)
-	var/bombz = z
-	Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,/datum/controller/subsystem/ticker/proc/station_explosion_detonation,src))
-	INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel,bombz)
+	really_actually_explode(off_station)
 	SSticker.roundend_check_paused = FALSE
 
+/obj/machinery/nuclearbomb/proc/really_actually_explode(off_station)
+	Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,/datum/controller/subsystem/ticker/proc/station_explosion_detonation,src))
+	INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel, z)
+
 /obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station)
 	if(off_station < 2)
 		return CINEMATIC_SELFDESTRUCT