Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

code/modules/admin/admin.dm

@@ -950,7 +950,7 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 
 //returns 1 to let the dragdrop code know we are trapping this event
 //returns 0 if we don't plan to trap the event
-/datum/admins/proc/cmd_ghost_drag(var/mob/dead/observer/frommob, var/mob/living/tomob)
+/datum/admins/proc/cmd_ghost_drag(var/mob/dead/observer/frommob, var/tothing)
 	if(!istype(frommob))
 		return //extra sanity check to make sure only observers are shoved into things
 
@@ -962,26 +962,49 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
 	if (!frommob.ckey)
 		return 0
 
-	var/question = ""
-	if (tomob.ckey)
-		question = "This mob already has a user ([tomob.key]) in control of it! "
-	question += "Are you sure you want to place [frommob.name]([frommob.key]) in control of [tomob.name]?"
+	if(istype(tothing, /obj/item))
+		var/mob/living/toitem = tothing
+
+		var/ask = alert("Are you sure you want to allow [frommob.name]([frommob.key]) to possess [toitem.name]?", "Place ghost in control of item?", "Yes", "No")
+		if (ask != "Yes")
+			return 1
+
+		if(!frommob || !toitem) //make sure the mobs don't go away while we waited for a response
+			return 1
+
+		var/mob/living/simple_animal/possessed_object/tomob = new(toitem)
+
+		message_admins("<span class='adminnotice'>[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].</span>")
+		log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].")
+		feedback_add_details("admin_verb","CGD")
+
+		tomob.ckey = frommob.ckey
+		qdel(frommob)
+
+
+	if(isliving(tothing))
+		var/mob/living/tomob = tothing
+
+		var/question = ""
+		if (tomob.ckey)
+			question = "This mob already has a user ([tomob.key]) in control of it! "
+		question += "Are you sure you want to place [frommob.name]([frommob.key]) in control of [tomob.name]?"
+
+		var/ask = alert(question, "Place ghost in control of mob?", "Yes", "No")
+		if (ask != "Yes")
+			return 1
+
+		if(!frommob || !tomob) //make sure the mobs don't go away while we waited for a response
+			return 1
+
+		if(tomob.client) //no need to ghostize if there is no client
+			tomob.ghostize(0)
+
+		message_admins("<span class='adminnotice'>[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].</span>")
+		log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].")
+		feedback_add_details("admin_verb","CGD")
+
+		tomob.ckey = frommob.ckey
+		qdel(frommob)
 
-	var/ask = alert(question, "Place ghost in control of mob?", "Yes", "No")
-	if (ask != "Yes")
 		return 1
-
-	if(!frommob || !tomob) //make sure the mobs don't go away while we waited for a response
-		return 1
-
-	if(tomob.client) //no need to ghostize if there is no client
-		tomob.ghostize(0)
-
-	message_admins("<span class='adminnotice'>[key_name_admin(usr)] has put [frommob.ckey] in control of [tomob.name].</span>")
-	log_admin("[key_name(usr)] stuffed [frommob.ckey] into [tomob.name].")
-	feedback_add_details("admin_verb","CGD")
-
-	tomob.ckey = frommob.ckey
-	qdel(frommob)
-
-	return 1

code/modules/admin/admin_verbs.dm

@@ -125,6 +125,7 @@ var/list/admin_verbs_server = list(
 	/datum/admins/proc/toggleAI,
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_debug_del_all,
+	/client/proc/cmd_debug_del_sing,
 	/datum/admins/proc/toggle_aliens,
 	/client/proc/delbook,
 	/client/proc/view_flagged_books,
@@ -141,6 +142,7 @@ var/list/admin_verbs_debug = list(
 	/client/proc/cmd_debug_mob_lists,
 	/client/proc/cmd_admin_delete,
 	/client/proc/cmd_debug_del_all,
+	/client/proc/cmd_debug_del_sing,
 	/client/proc/reload_admins,
 	/client/proc/restart_controller,
 	/client/proc/enable_debug_verbs,

code/modules/admin/verbs/debug.dm

@@ -359,6 +359,27 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		message_admins("[key_name_admin(src)] has deleted all instances of [hsbitem].", 0)
 	feedback_add_details("admin_verb","DELA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/proc/cmd_debug_del_sing()
+	set category = "Debug"
+	set name = "Del Singulo / Tesla"
+
+	if(!check_rights(R_DEBUG))
+		return
+
+	//This gets a confirmation check because it's way easier to accidentally hit this and delete things than it is with del-all
+	var/confirm = alert("This will delete ALL Singularities and Tesla orbs except for any that are on away mission z-levels or the centcomm z-level. Are you sure you want to delete them?", "Confirm Panic Button", "Yes", "No")
+	if(confirm != "Yes")
+		return
+
+	for(var/I in singularities)
+		var/obj/singularity/S = I
+		if(S.z == ZLEVEL_CENTCOMM  || S.z >= MAX_Z)
+			continue
+		qdel(S)
+	log_admin("[key_name(src)] has deleted all Singularities and Tesla orbs.")
+	message_admins("[key_name_admin(src)] has deleted all Singularities and Tesla orbs.", 0)
+	feedback_add_details("admin_verb","DELS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/proc/cmd_debug_make_powernets()
 	set category = "Debug"
 	set name = "Make Powernets"

code/modules/admin/verbs/onlyone.dm

@@ -3,7 +3,7 @@
 		alert("The game hasn't started yet!")
 		return
 
-	var/list/incompatible_species = list("Plasmaman")
+	var/list/incompatible_species = list("Plasmaman", "Vox")
 	for(var/mob/living/carbon/human/H in player_list)
 		if(H.stat == DEAD || !(H.client))
 			continue

code/modules/admin/verbs/onlyoneteam.dm

@@ -3,7 +3,8 @@
 		alert("The game hasn't started yet!")
 		return
 
-	var/list/incompatible_species = list("Plasmaman")
+	var/list/incompatible_species = list("Plasmaman", "Vox")
+	var/team_toggle = 0
 	for(var/mob/living/carbon/human/H in player_list)
 		if(H.stat == DEAD || !(H.client))
 			continue
@@ -27,7 +28,7 @@
 		H.equip_to_slot_or_del(new /obj/item/weapon/beach_ball/dodgeball(H), slot_r_hand)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
 
-		if(prob(50))
+		if(!team_toggle)
 			team_alpha += H
 
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), slot_w_uniform)
@@ -53,6 +54,7 @@
 			W.registered_name = H.real_name
 			H.equip_to_slot_or_del(W, slot_wear_id)
 
+		team_toggle = !team_toggle
 		H.species.equip(H)
 		H.regenerate_icons()