First merge from upstream

code/modules/admin/DB ban/functions.dm

@@ -377,13 +377,13 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
 				if(playercid)
 					cidsearch  = "AND computerid = '[playercid]' "
 			else
-				if(adminckey && lentext(adminckey) >= 3)
+				if(adminckey && length(adminckey) >= 3)
 					adminsearch = "AND a_ckey LIKE '[adminckey]%' "
-				if(playerckey && lentext(playerckey) >= 3)
+				if(playerckey && length(playerckey) >= 3)
 					playersearch = "AND ckey LIKE '[playerckey]%' "
-				if(playerip && lentext(playerip) >= 3)
+				if(playerip && length(playerip) >= 3)
 					ipsearch  = "AND ip LIKE '[playerip]%' "
-				if(playercid && lentext(playercid) >= 7)
+				if(playercid && length(playercid) >= 7)
 					cidsearch  = "AND computerid LIKE '[playercid]%' "
 
 			if(dbbantype)

code/modules/admin/admin.dm

@@ -192,8 +192,8 @@ proc/admin_notice(var/message, var/rights)
 	// language toggles
 	body += "<br><br><b>Languages:</b><br>"
 	var/f = 1
-	for(var/k in all_languages)
-		var/datum/language/L = all_languages[k]
+	for(var/k in GLOB.all_languages)
+		var/datum/language/L = GLOB.all_languages[k]
 		if(!(L.flags & INNATE))
 			if(!f) body += " | "
 			else f = 0
@@ -1055,8 +1055,10 @@ var/datum/announcement/minor/admin_min_announcer = new
 
 	if(!seedtype || !plant_controller.seeds[seedtype])
 		return
-	var/datum/seed/S = plant_controller.seeds[seedtype]
-	S.harvest(usr,0,0,1)
+	var/amount = input("Amount of fruit to spawn", "Fruit Amount", 1) as null|num
+	if(!isnull(amount))
+		var/datum/seed/S = plant_controller.seeds[seedtype]
+		S.harvest(usr,0,0,amount)
 	log_admin("[key_name(usr)] spawned [seedtype] fruit at ([usr.x],[usr.y],[usr.z])")
 
 /datum/admins/proc/spawn_custom_item()

code/modules/admin/admin_secrets.dm

@@ -99,18 +99,18 @@ var/datum/admin_secrets/admin_secrets = new()
 /datum/admin_secret_item/admin_secret
 	category = /datum/admin_secret_category/admin_secrets
 	log = 0
-	permissions = R_ADMIN|R_EVENT
+	permissions = R_ADMIN //VOREStation Edit
 
 /datum/admin_secret_item/random_event
 	category = /datum/admin_secret_category/random_events
-	permissions = R_FUN|R_EVENT
+	permissions = R_FUN //VOREStation Edit
 	warn_before_use = 1
 
 /datum/admin_secret_item/fun_secret
 	category = /datum/admin_secret_category/fun_secrets
-	permissions = R_FUN|R_EVENT
+	permissions = R_FUN //VOREStation Edit
 	warn_before_use = 1
 
 /datum/admin_secret_item/final_solution
 	category = /datum/admin_secret_category/final_solutions
-	permissions = R_FUN|R_SERVER|R_ADMIN|R_EVENT
+	permissions = R_FUN|R_SERVER|R_ADMIN //VOREStation Edit

code/modules/admin/admin_verbs.dm

@@ -358,52 +358,13 @@ var/list/admin_verbs_mod = list(
 	/datum/admins/proc/view_atk_log		//shows the server combat-log, doesn't do anything presently,
 )
 
+//VOREStation Edit Start - Highly Modified List
 var/list/admin_verbs_event_manager = list(
-	/client/proc/cmd_event_say,
-	/client/proc/cmd_admin_pm_context,
-	/client/proc/cmd_admin_pm_panel,
-	/datum/admins/proc/PlayerNotes,
-	/client/proc/admin_ghost,
-	/datum/admins/proc/show_player_info,
-	/client/proc/dsay,
-	/client/proc/cmd_admin_subtle_message,
-	/client/proc/debug_variables,
-	/client/proc/check_antagonists,
-	/client/proc/aooc,
-	/datum/admins/proc/paralyze_mob,
-	/client/proc/cmd_admin_direct_narrate,
-	/client/proc/allow_character_respawn,
-	/datum/admins/proc/sendFax,
-	/client/proc/respawn_character,
-	/proc/possess,
-	/proc/release,
-	/client/proc/callproc,
-	/client/proc/callproc_datum,
-	/client/proc/debug_controller,
-	/client/proc/show_gm_status,
-	/datum/admins/proc/change_weather,
-	/datum/admins/proc/change_time,
-	/client/proc/admin_give_modifier,
-	/client/proc/Jump,
-	/client/proc/jumptomob,
-	/client/proc/jumptocoord,
-	/client/proc/cmd_admin_delete,
-	/datum/admins/proc/delay,
-	/client/proc/Set_Holiday,
-	/client/proc/make_sound,
-	/client/proc/toggle_random_events,
-	/datum/admins/proc/cmd_admin_dress,
-	/client/proc/cmd_admin_gib_self,
-	/client/proc/drop_bomb,
-	/client/proc/cmd_admin_add_freeform_ai_law,
-	/client/proc/cmd_admin_add_random_ai_law,
-	/client/proc/make_sound,
-	/client/proc/toggle_random_events,
-	/client/proc/editappear,
-	/client/proc/roll_dices,
-	/datum/admins/proc/call_supply_drop,
-	/datum/admins/proc/call_drop_pod
+	/client/proc/cmd_admin_say,			//admin-only ooc chat,
+	/client/proc/cmd_mod_say,
+	/client/proc/cmd_event_say
 )
+//VOREStation Edit End
 
 /client/proc/add_admin_verbs()
 	if(holder)

code/modules/admin/secrets/fun_secrets/paintball_mode.dm

@@ -6,8 +6,8 @@
 	if(!.)
 		return
 
-	for(var/species in all_species)
-		var/datum/species/S = all_species[species]
+	for(var/species in GLOB.all_species)
+		var/datum/species/S = GLOB.all_species[species]
 		S.blood_color = "rainbow"
 	for(var/obj/effect/decal/cleanable/blood/B in world)
 		B.basecolor = "rainbow"

code/modules/admin/topic.dm

@@ -251,7 +251,7 @@
 		href_list["secretsadmin"] = "check_antagonist"
 
 	else if(href_list["delay_round_end"])
-		if(!check_rights(R_SERVER|R_EVENT))	return
+		if(!check_rights(R_SERVER))	return //VOREStation Edit
 
 		ticker.delay_end = !ticker.delay_end
 		log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
@@ -1238,7 +1238,7 @@
 		show_player_panel(M)
 
 	else if(href_list["adminplayerobservejump"])
-		if(!check_rights(R_EVENT|R_MOD|R_ADMIN|R_SERVER|R_EVENT))	return
+		if(!check_rights(R_MOD|R_ADMIN|R_SERVER))	return //VOREStation Edit
 
 		var/mob/M = locate(href_list["adminplayerobservejump"])
 
@@ -1248,7 +1248,7 @@
 		C.jumptomob(M)
 
 	else if(href_list["adminplayerobservefollow"])
-		if(!check_rights(R_EVENT|R_MOD|R_ADMIN|R_SERVER|R_EVENT))
+		if(!check_rights(R_MOD|R_ADMIN|R_SERVER)) //VOREStation Edit
 			return
 
 		var/mob/M = locate(href_list["adminplayerobservefollow"])
@@ -1268,7 +1268,7 @@
 		if(ismob(M))
 			var/take_msg = "<span class='notice'><b>ADMINHELP</b>: <b>[key_name(usr.client)]</b> is attending to <b>[key_name(M)]'s</b> adminhelp, please don't dogpile them.</span>"
 			for(var/client/X in admins)
-				if((R_ADMIN|R_MOD|R_EVENT|R_SERVER) & X.holder.rights)
+				if((R_ADMIN|R_MOD|R_SERVER) & X.holder.rights) //VOREStation Edit
 					to_chat(X, take_msg)
 			to_chat(M, "<span class='notice'><b>Your adminhelp is being attended to by [usr.client]. Thanks for your patience!</b></span>")
 			// VoreStation Edit Start
@@ -1284,7 +1284,7 @@
 			to_chat(usr, "<span class='warning'>Unable to locate mob.</span>")
 
 	else if(href_list["adminplayerobservecoodjump"])
-		if(!check_rights(R_ADMIN|R_SERVER|R_MOD|R_EVENT))	return
+		if(!check_rights(R_ADMIN|R_SERVER|R_MOD))	return //VOREStation Edit
 
 		var/x = text2num(href_list["X"])
 		var/y = text2num(href_list["Y"])
@@ -1876,13 +1876,13 @@
 				vsc.SetDefault(usr)
 
 	else if(href_list["toglang"])
-		if(check_rights(R_SPAWN|R_EVENT))
+		if(check_rights(R_SPAWN)) //VOREStation Edit
 			var/mob/M = locate(href_list["toglang"])
 			if(!istype(M))
 				usr << "[M] is illegal type, must be /mob!"
 				return
 			var/lang2toggle = href_list["lang"]
-			var/datum/language/L = all_languages[lang2toggle]
+			var/datum/language/L = GLOB.all_languages[lang2toggle]
 
 			if(L in M.languages)
 				if(!M.remove_language(lang2toggle))

code/modules/admin/verbs/adminhelp.dm

@@ -175,7 +175,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		message_admins("<font color='blue'>Ticket [TicketHref("#[id]")] created</font>")
 	else
 		MessageNoRecipient(parsed_message)
-
+		send2adminchat() //VOREStation Add
 		//show it to the person adminhelping too
 		to_chat(C, "<span class='adminnotice'>PM to-<b>Admins</b>: [name]</span>")
 

code/modules/admin/verbs/adminsay.dm

@@ -2,7 +2,7 @@
 	set category = "Special Verbs"
 	set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite
 	set hidden = 1
-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_ADMIN|R_STEALTH)) //VOREStation Edit
 		return
 
 	msg = sanitize(msg)
@@ -11,10 +11,11 @@
 
 	log_adminsay(msg,src)
 
-	if(check_rights(R_ADMIN,0))
-		for(var/client/C in admins)
-			if(R_ADMIN & C.holder.rights)
-				C << "<span class='admin_channel'>" + create_text_tag("admin", "ADMIN:", C) + " <span class='name'>[key_name(usr, 1)]</span>([admin_jump_link(mob, src)]): <span class='message'>[msg]</span></span>"
+	//VOREStation Edit Start - Adds R_EVENT
+	for(var/client/C in admins)
+		if(check_rights(R_ADMIN|R_EVENT))
+			C << "<span class='admin_channel'>" + create_text_tag("admin", "ADMIN:", C) + " <span class='name'>[key_name(usr, 1)]</span>([admin_jump_link(mob, src)]): <span class='message'>[msg]</span></span>"
+	//VOREStation Edit End
 
 	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
@@ -23,7 +24,7 @@
 	set name = "Msay"
 	set hidden = 1
 
-	if(!check_rights(R_ADMIN|R_MOD|R_SERVER))
+	if(!check_rights(R_ADMIN|R_MOD|R_SERVER|R_EVENT)) //VOREStation Edit
 		return
 
 	msg = sanitize(msg)
@@ -36,7 +37,7 @@
 	if(check_rights(R_ADMIN, 0))
 		sender_name = "<span class='admin'>[sender_name]</span>"
 	for(var/client/C in admins)
-		if(check_rights(R_ADMIN|R_MOD|R_SERVER))
+		if(check_rights(R_ADMIN|R_MOD|R_SERVER|R_STEALTH)) //VOREStation Edit
 			C << "<span class='mod_channel'>" + create_text_tag("mod", "MOD:", C) + " <span class='name'>[sender_name]</span>([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>"
 
 	feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/admin/verbs/randomverbs.dm

@@ -615,7 +615,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Special Verbs"
 	set name = "Explosion"
 
-	if(!check_rights(R_DEBUG|R_FUN|R_EVENT))	return
+	if(!check_rights(R_DEBUG|R_FUN))	return //VOREStation Edit
 
 	var/devastation = input("Range of total devastation. -1 to none", text("Input"))  as num|null
 	if(devastation == null) return
@@ -643,7 +643,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Special Verbs"
 	set name = "EM Pulse"
 
-	if(!check_rights(R_DEBUG|R_FUN|R_EVENT))	return
+	if(!check_rights(R_DEBUG|R_FUN))	return //VOREStation Edit
 
 	var/heavy = input("Range of heavy pulse.", text("Input"))  as num|null
 	if(heavy == null) return
@@ -669,7 +669,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Special Verbs"
 	set name = "Gib"
 
-	if(!check_rights(R_ADMIN|R_FUN|R_EVENT))	return
+	if(!check_rights(R_ADMIN|R_FUN))	return //VOREStation Edit
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm != "Yes") return
@@ -826,7 +826,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if ((!( ticker ) || !emergency_shuttle.location()))
 		return
 
-	if(!check_rights(R_ADMIN|R_EVENT))	return
+	if(!check_rights(R_ADMIN))	return //VOREStation Edit
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm != "Yes") return
@@ -855,7 +855,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set category = "Admin"
 	set name = "Cancel Shuttle"
 
-	if(!check_rights(R_ADMIN|R_EVENT))	return
+	if(!check_rights(R_ADMIN))	return //VOREStation Edit
 
 	if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return
 
@@ -876,7 +876,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if (!ticker)
 		return
 
-	if(!check_rights(R_ADMIN|R_EVENT))	return
+	if(!check_rights(R_ADMIN))	return //VOREStation Edit
 
 	emergency_shuttle.deny_shuttle = !emergency_shuttle.deny_shuttle
 
@@ -932,7 +932,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	set name = "Toggle random events on/off"
 
 	set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
-	if(!check_rights(R_SERVER|R_EVENT))	return
+	if(!check_rights(R_SERVER))	return //VOREStation Edit
 
 	if(!config.allow_random_events)
 		config.allow_random_events = 1

code/modules/admin/view_variables/modify_variables.dm

@@ -55,11 +55,11 @@ GLOBAL_PROTECT(VVpixelmovement)
 		//	the type with the base type removed from the begaining
 		var/fancytype = types[D.type]
 		if (findtext(fancytype, types[type]))
-			fancytype = copytext(fancytype, lentext(types[type])+1)
-		var/shorttype = copytext("[D.type]", lentext("[type]")+1)
-		if (lentext(shorttype) > lentext(fancytype))
+			fancytype = copytext(fancytype, length(types[type])+1)
+		var/shorttype = copytext("[D.type]", length("[type]")+1)
+		if (length(shorttype) > length(fancytype))
 			shorttype = fancytype
-		if (!lentext(shorttype))
+		if (!length(shorttype))
 			shorttype = "/"
 
 		.["[D]([shorttype])\ref[D]#[i]"] = D

code/modules/admin/view_variables/topic.dm

@@ -289,7 +289,7 @@
 			usr << "This can only be done to instances of type /mob/living/carbon/human"
 			return
 
-		var/new_species = input("Please choose a new species.","Species",null) as null|anything in all_species
+		var/new_species = input("Please choose a new species.","Species",null) as null|anything in GLOB.all_species
 
 		if(!H)
 			usr << "Mob doesn't exist anymore"
@@ -308,7 +308,7 @@
 			usr << "This can only be done to instances of type /mob"
 			return
 
-		var/new_language = input("Please choose a language to add.","Language",null) as null|anything in all_languages
+		var/new_language = input("Please choose a language to add.","Language",null) as null|anything in GLOB.all_languages
 
 		if(!new_language)
 			return