Merge branch 'master' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

code/modules/admin/admin_verbs.dm

@@ -103,7 +103,6 @@ var/list/admin_verbs_admin = list(
 	/datum/admins/proc/paralyze_mob,
 	/client/proc/fixatmos,
 	/datum/admins/proc/quick_nif, //VOREStation Add,
-	/datum/admins/proc/assistant_ratio, //VOREStation Add,
 	/datum/admins/proc/sendFax
 	)
 
@@ -510,9 +509,11 @@ var/list/admin_verbs_event_manager = list(
 
 	if(choice == "Show 'em!" && mob.plane_holder)
 		mob.plane_holder.set_vis(VIS_GHOSTS,TRUE)
+		usr.see_invisible = SEE_INVISIBLE_CULT
 		to_chat(src,"<span class='notice'>Ghosts are now visible (while in this mob).</span>")
 	else if(mob.plane_holder)
 		mob.plane_holder.set_vis(VIS_GHOSTS,FALSE)
+		usr.see_invisible = initial(mob.see_invisible)
 		to_chat(src,"<span class='notice'>Ghosts are now hidden (while in this mob).</span>")
 
 /client/proc/invisimin()
@@ -786,11 +787,11 @@ var/list/admin_verbs_event_manager = list(
 	set category = "Debug"
 	set name = "Kill Air"
 	set desc = "Toggle Air Processing"
-	if(air_processing_killed)
-		air_processing_killed = 0
+	if(!SSair.can_fire)
+		SSair.can_fire = TRUE
 		usr << "<b>Enabled air processing.</b>"
 	else
-		air_processing_killed = 1
+		SSair.can_fire = FALSE
 		usr << "<b>Disabled air processing.</b>"
 	feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] used 'kill air'.")
@@ -1051,6 +1052,8 @@ var/list/admin_verbs_event_manager = list(
 	set name = "Man Up"
 	set desc = "Tells mob to man up and deal with it."
 
+	if(alert("Are you sure you want to tell them to man up?","Confirmation","Deal with it","No")=="No") return
+
 	T << "<span class='notice'><b><font size=3>Man up and deal with it.</font></b></span>"
 	T << "<span class='notice'>Move on.</span>"
 
@@ -1062,6 +1065,8 @@ var/list/admin_verbs_event_manager = list(
 	set name = "Man Up Global"
 	set desc = "Tells everyone to man up and deal with it."
 
+	if(alert("Are you sure you want to tell the whole server up?","Confirmation","Deal with it","No")=="No") return
+
 	for (var/mob/T as mob in mob_list)
 		T << "<br><center><span class='notice'><b><font size=4>Man up.<br> Deal with it.</font></b><br>Move on.</span></center><br>"
 		T << 'sound/voice/ManUp1.ogg'

code/modules/admin/verbs/debug.dm

@@ -378,10 +378,15 @@
 		qdel(adminmob)
 	feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/client/proc/take_picture(var/atom/A in world)
+	set name = "Save PNG"
+	set category = "Debug"
+	set desc = "Opens a dialog to save a PNG of any object in the game."
 
+	if(!check_rights(R_DEBUG))
+		return
 
-
-
+	downloadImage(A)
 
 /client/proc/cmd_admin_areatest()
 	set category = "Mapping"

code/modules/admin/verbs/debug_vr.dm

@@ -30,18 +30,3 @@
 
 	log_and_message_admins("[key_name(src)] Quick NIF'd [H.real_name].")
 	feedback_add_details("admin_verb","QNIF") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-/datum/admins/proc/assistant_ratio()
-	set category = "Admin"
-	set name = "Toggle Asst. Ratio"
-	set desc = "Toggles the assistant ratio enforcement on/off."
-
-	if(!check_rights(R_ADMIN))
-		return
-
-	if(isnull(config.assistants_ratio))
-		to_chat(usr,"<span class='warning'>Assistant ratio enforcement isn't even turned on...</span>")
-		return
-
-	config.assistants_ratio *= -1
-	to_chat(usr,"<span class='notice'>Assistant ratio enforcement now [config.assistants_ratio > 0 ? "<b>en</b>abled" : "<b>dis</b>abled"].</span>")

code/modules/admin/verbs/grief_fixers.dm

@@ -45,10 +45,7 @@
 
 	usr << "\[4/5\] - All turfs reset to roundstart values."
 
-	qdel(air_master)
-	air_master = new
-	air_master.Setup()
-	spawn air_master.Start()
+	SSair.RebootZAS()
 
 	usr << "\[5/5\] - ZAS Rebooted"
 	world << "<span class = 'danger'>Atmosphere restart completed in <b>[(world.timeofday - current_time)/10]</b> seconds.</span>"

code/modules/admin/verbs/map_template_loadverb.dm

@@ -41,7 +41,12 @@
 	if(!map)
 		return
 	template = map_templates[map]
-
+	
+	if(template.width > world.maxx || template.height > world.maxy)		
+		if(alert(usr,"This template is larger than the existing z-levels. It will EXPAND ALL Z-LEVELS to match the size of the template. This may cause chaos. Are you sure you want to do this?","DANGER!!!","Cancel","Yes") == "Cancel")
+			to_chat(usr,"Template placement aborted.")
+			return
+	
 	if(alert(usr,"Confirm map load.", "Template Confirm","No","Yes") == "Yes")
 		if(template.load_new_z())
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has placed a map template ([template.name]) on Z level [world.maxz].</span>")

code/modules/admin/verbs/mapping.dm

@@ -162,7 +162,8 @@ var/list/debug_verbs = list (
         ,/datum/admins/proc/setup_supermatter
 		,/client/proc/atmos_toggle_debug
 		,/client/proc/spawn_tanktransferbomb
-		,/client/proc/debug_process_scheduler
+		,/client/proc/debug_process_scheduler // VOREStation Edit - Nice
+		,/client/proc/take_picture
 	)
 
 
@@ -274,14 +275,7 @@ var/list/debug_verbs = list (
 	set name = "Reboot ZAS"
 
 	if(alert("This will destroy and remake all zone geometry on the whole map.","Reboot ZAS","Reboot ZAS","Nevermind") == "Reboot ZAS")
-		var/datum/controller/air_system/old_air = air_master
-		for(var/zone/zone in old_air.zones)
-			zone.c_invalidate()
-		qdel(old_air)
-		air_master = new
-		air_master.Setup()
-		spawn air_master.Start()
-
+		SSair.RebootZAS()
 
 /client/proc/count_objects_on_z_level()
 	set category = "Mapping"

code/modules/admin/verbs/randomverbs.dm

@@ -392,8 +392,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		var/samejob = alert(src,"Found [picked_client.prefs.real_name] in data core. They were [record_found.fields["real_rank"]] this round. Assign same job? They will not be re-added to the manifest/records, either way.","Previously spawned","Yes","Assistant","No")
 		if(samejob == "Yes")
 			charjob = record_found.fields["real_rank"]
-		else if(samejob == "Assistant")
-			charjob = "Assistant"
+		else if(samejob == USELESS_JOB) //VOREStation Edit - Visitor not Assistant
+			charjob = USELESS_JOB //VOREStation Edit - Visitor not Assistant
 	else
 		records = alert(src,"No data core entry detected. Would you like add them to the manifest, and sec/med/HR records?","Records","Yes","No","Cancel")
 		if(records == "Cancel")