Merge branch 'beta-dev' into dcp096-module

baystation12.dme

@@ -328,7 +328,6 @@
 #include "code\datums\recipe.dm"
 #include "code\datums\reference_tracking.dm"
 #include "code\datums\ruins.dm"
-#include "code\datums\security_state.dm"
 #include "code\datums\shackle_law_sets.dm"
 #include "code\datums\sound_player.dm"
 #include "code\datums\suit_sensor_jammer_method.dm"

code/datums/outfits/jobs/engineering.dm

@@ -11,14 +11,14 @@
 	l_pocket = /obj/item/device/radio
 	l_ear = /obj/item/device/radio/headset/heads/ce
 
-/decl/hierarchy/outfit/job/engineering/conteng
+/* /decl/hierarchy/outfit/job/engineering/conteng			Celadon Changes => mod_celadon/outfits/code/outfits.dm
 	name = OUTFIT_JOB_NAME("Containment Engineer")
 	uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering
 	shoes = /obj/item/clothing/shoes/dutyboots
 	id_type = /obj/item/card/id/seclvl4eng
 	belt = /obj/item/storage/belt/utility/full
 	l_pocket = /obj/item/device/radio
-	l_ear = /obj/item/device/radio/headset/conteng
+	l_ear = /obj/item/device/radio/headset/conteng */
 
 /decl/hierarchy/outfit/job/engineering/seneng
 	name = OUTFIT_JOB_NAME("Senior Engineer")

code/datums/outfits/jobs/mtf.dm

@@ -10,7 +10,7 @@
 /decl/hierarchy/outfit/mtf/epsilon_11
 	hierarchy_type = /decl/hierarchy/outfit/mtf/epsilon_11
 
-/decl/hierarchy/outfit/mtf/epsilon_11/agent
+/* /decl/hierarchy/outfit/mtf/epsilon_11/agent
 	name = OUTFIT_JOB_NAME("MTF Epsilon-11 Agent")
 	uniform = /obj/item/clothing/under/ert/epsilon11
 	suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon
@@ -80,7 +80,7 @@
 	r_pocket = null
 	id_type = /obj/item/card/id/mtf/ninetail
 	belt = /obj/item/defibrillator/compact/combat/loaded
-	backpack_contents = list(/obj/item/ammo_magazine/scp/p90_mag/ap = 3,/obj/item/clothing/mask/gas = 1,/obj/item/reagent_containers/ivbag/blood/OMinus = 2,/obj/item/storage/pill_bottle/zoom = 1)
+	backpack_contents = list(/obj/item/ammo_magazine/scp/p90_mag/ap = 3,/obj/item/clothing/mask/gas = 1,/obj/item/reagent_containers/ivbag/blood/OMinus = 2,/obj/item/storage/pill_bottle/zoom = 1) */
 
 /decl/hierarchy/outfit/mtf/eta_10 // See No Evil
 	name = OUTFIT_JOB_NAME("MTF Eta-10 Operative")

code/datums/security_state.dm

@@ -1,4 +1,4 @@
-/decl/security_state
+/* /decl/security_state			=# CELADON_CHANGES => mod_celadon\_components\code\security_state.dm #=
 	// When defining any of these values type paths should be used, not instances. Instances will be acquired in /New()
 
 	// The security level in which the destruction of the site is likely. Not selectable by personnel; set internally or by admins
@@ -292,4 +292,4 @@
 
 /decl/security_level/code_delta/switching_up_to()
 	security_announcement_delta.Announce("The destruction of the site is imminent. All personnel are to obey instructions given by administrative staff. Any violation of these orders is punishable by immediate termination. This is not a drill.", "Attention! Code Delta evacuation procedures now in effect!")
-	notify_station()
+	notify_station() */

code/game/jobs/job/command.dm

@@ -214,7 +214,7 @@
 	ideal_character_age = 30
 	outfit_type = /decl/hierarchy/outfit/job/civ/o5rep
 	requirements = list(EXP_TYPE_BUR = 300)
-	class = CLASS_B
+	class = CLASS_A
 	hud_icon = "hud05rep"
 	access = list(
 		ACCESS_ADMIN_LVL1,

code/game/jobs/job/security.dm

@@ -210,7 +210,7 @@
 // OFFICERS
 //##
 
-/datum/job/ncoofficerlcz
+/* /datum/job/ncoofficerlcz			=# Mod Celadon Changes => mod_celadon\outfits\code\job\security.dm #=
 	title = "LCZ Sergeant"
 	department = "Light Containment Personnel"
 	selection_color = "#601c1c"
@@ -256,7 +256,7 @@
 	    SKILL_WEAPONS     = SKILL_EXPERIENCED,
 	    SKILL_FORENSICS   = SKILL_TRAINED
 	)
-	skill_points = 21
+	skill_points = 21 */
 
 /datum/job/ncoofficerhcz
 	title = "HCZ Sergeant"

code/game/response_team.dm

@@ -5,8 +5,8 @@ var/global/send_emergency_team = 0 // Used for automagic response teams
 								   // 'admin_emergency_team' for admin-spawned response teams
 
 /client/proc/response_team()
-	set name = "Dispatch Mobile Task Force"
-	set category = "Special Verbs"
+	set name = "Dispatch MTF"
+	set category = "Fun"
 	set desc = "Send an MTF squad"
 
 	if(!holder)
@@ -47,7 +47,7 @@ var/global/send_emergency_team = 0 // Used for automagic response teams
 /client/verb/JoinResponseTeam()
 
 	set name = "Join MTF Squad"
-	set category = "IC"
+	set category = "OOC"
 
 	if(!MayRespawn(1))
 		to_chat(usr, SPAN_WARNING("You cannot join the response team at this time."))

code/modules/admin/admin.dm

@@ -501,8 +501,8 @@ var/global/floorIsLava = 0
 		world.Reboot()
 
 
-/datum/admins/proc/announce()
-	set category = "Special Verbs"
+/* /datum/admins/proc/announce()
+	set category = "Admin"
 	set name = "Announce"
 	set desc="Announce your desires to the world"
 	if(!check_rights(0))	return
@@ -513,7 +513,7 @@ var/global/floorIsLava = 0
 		message = replacetext(message, "\n", "<br>") // required since we're putting it in a <p> tag
 		to_world("<span class=notice><b>[usr.key] Announces:</b><p style='text-indent: 50px'>[message]</p></span>")
 		log_admin("Announce: [key_name(usr)] : [message]")
-	SSstatistics.add_field_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSstatistics.add_field_details("admin_verb","A") /If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! */
 
 /datum/admins/proc/toggleooc()
 	set category = "Server"
@@ -1211,7 +1211,7 @@ var/global/floorIsLava = 0
 	return 1
 
 /datum/admins/proc/force_antag_latespawn()
-	set category = "Admin"
+	set category = "Debug"
 	set name = "Force Template Spawn"
 	set desc = "Force an antagonist template to spawn."
 
@@ -1236,7 +1236,7 @@ var/global/floorIsLava = 0
 	antag.attempt_auto_spawn()
 
 /datum/admins/proc/force_mode_latespawn()
-	set category = "Admin"
+	set category = "Fun"
 	set name = "Force Mode Spawn"
 	set desc = "Force autotraitor to proc."
 
@@ -1280,7 +1280,7 @@ var/global/floorIsLava = 0
 
 
 /datum/admins/proc/sendFax()
-	set category = "Special Verbs"
+	set category = "Fun"
 	set name = "Send Fax"
 	set desc = "Sends a fax to this machine"
 
@@ -1318,7 +1318,7 @@ var/global/floorIsLava = 0
 
 
 /client/proc/check_fax_history()
-	set category = "Special Verbs"
+	set category = "Fun"
 	set name = "Check Fax History"
 	set desc = "Look up the faxes sent this round."
 

code/modules/admin/admin_verbs.dm

@@ -512,7 +512,7 @@ var/list/admin_verbs_mentors = list(
 	return
 
 /client/proc/colorooc()
-	set category = "Fun"
+	set category = "OOC"
 	set name = "OOC Text Color"
 	if(!check_rights(R_ADMIN|R_MOD, FALSE))	return
 	var/response = alert(src, "Please choose a distinct color that is easy to read and doesn't mix with all the other chat and radio frequency colors.", "Change own OOC color", "Pick new color", "Reset to default", "Cancel")
@@ -569,7 +569,7 @@ var/list/admin_verbs_mentors = list(
 #undef AUTOBANTIME
 
 /client/proc/drop_bomb() // Some admin dickery that can probably be done better -- TLE
-	set category = "Special Verbs"
+	set category = "Fun"
 	set name = "Drop Bomb"
 	set desc = "Cause an explosion of varying strength at your location."
 	if(!check_rights(R_FUN)) return
@@ -605,7 +605,7 @@ var/list/admin_verbs_mentors = list(
 
 /client/proc/togglebuildmodeself()
 	set name = "Toggle Build Mode Self"
-	set category = "Special Verbs"
+	set category = "Fun"
 
 	if(!check_rights(R_ADMIN))
 		return
@@ -615,7 +615,7 @@ var/list/admin_verbs_mentors = list(
 	SSstatistics.add_field_details("admin_verb","TBMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/object_talk(msg as text) // -- TLE
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "oSay"
 	set desc = "Display a message to everyone who can hear the target"
 	if(mob.control_object)
@@ -734,7 +734,7 @@ var/list/admin_verbs_mentors = list(
 	SSstatistics.add_field_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/change_security_level()
-	set name = "Set security level"
+	set name = "Fun"
 	set desc = "Sets the security level"
 	set category = "Fun"
 

code/modules/admin/ticket.dm

@@ -238,7 +238,7 @@ var/list/ticket_panels = list()
 
 /client/verb/view_tickets()
 	set name = "View Tickets"
-	set category = "Admin"
+	set category = "Staff Help"
 
 	var/datum/ticket_panel/ticket_panel = new()
 	ticket_panels[src] = ticket_panel

code/modules/admin/verbs/SDQL.dm

@@ -4,7 +4,7 @@
 //Note: For use in BS12, need text_starts_with proc, and to modify the action on select to use BS12's object edit command(s).
 
 /client/proc/SDQL_query(query_text as message)
-	set category = "Admin"
+	set category = "Debug"
 	if(!check_rights(R_DEBUG))  //Shouldn't happen... but just to be safe.
 		log_and_message_staff(" - Non-admin attempted to execute a SDQL query!")
 

code/modules/admin/verbs/deadsay.dm

@@ -1,5 +1,5 @@
 /client/proc/dsay(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Dsay" //Gave this shit a shorter name so you only have to time out "dsay" rather than "dead say" to use it --NeoFite
 	set hidden = 1
 

code/modules/admin/verbs/grief_fixers.dm

@@ -1,6 +1,6 @@
 /client/proc/fix_air(turf/simulated/T in world)
 	set name = "Fix Air"
-	set category = "Admin"
+	set category = "Debug"
 	set desc = "Fixes air in specified radius."
 
 	if(!check_rights(R_ADMIN))
@@ -25,7 +25,7 @@
 		log_and_message_staff("[usr] fixed air with range [range] in area [T.loc.name]. [changed_zones.len] [(changed_zones.len) > 1 ? "zones have" : "zone has"] been affected.")
 
 /client/proc/fixatmos()
-	set category = "Admin"
+	set category = "Debug"
 	set name = "Fix Atmospherics Grief"
 
 	if(!check_rights(R_ADMIN|R_DEBUG)) return

code/modules/admin/verbs/map_template_loadverb.dm

@@ -1,5 +1,5 @@
 /datum/admins/proc/map_template_load()
-	set category = "Fun"
+	set category = "Debug"
 	set desc = "Pick a map template to load at your current location. You will be able to confirm bounds before committing."
 	set name = "Map Template - Place"
 
@@ -32,7 +32,7 @@
 	usr.client.images -= preview
 
 /datum/admins/proc/map_template_load_new_z()
-	set category = "Fun"
+	set category = "Debug"
 	set desc = "Pick a map template to load as a new zlevel, or a set of new zlevels if multi-z."
 	set name = "Map Template - Place In New Z"
 
@@ -66,7 +66,7 @@
 		to_chat(usr, "Failed to place map template [log_name].")
 
 /datum/admins/proc/map_template_upload()
-	set category = "Fun"
+	set category = "Debug"
 	set desc = "Upload a .dmm file to use as a map template. Any unknown types will be skipped!"
 	set name = "Map Template - Upload"
 

code/modules/admin/verbs/randomverbs.dm

@@ -75,7 +75,7 @@
 
 
 /client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Global Narrate"
 	set desc = "Narrate to everyone."
 
@@ -152,7 +152,7 @@
 
 //Condenced version of the mob targeting narrates
 /client/proc/cmd_admin_narrate(atom/A)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Narrate"
 	set desc = "Selection of narrates targeting a mob."
 
@@ -211,7 +211,7 @@
 
 // Local narrate, narrates to everyone who can see where you are regardless of whether they are blind or deaf.
 /client/proc/cmd_admin_local_narrate()
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Local Narrate"
 	set desc = "Narrate to everyone who can see the turf your mob is on."
 
@@ -288,7 +288,7 @@
 	SSstatistics.add_field_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_notarget(mob/living/M as mob in SSmobs.mob_list)
-	set category = "Special Verbs"
+	set category = "Debug"
 	set name = "Notarget"
 	set desc = "Makes the target mob become invisible to all simple mobs."
 
@@ -374,7 +374,7 @@ Ccomp's first proc.
 	. = sortAssoc(.)
 
 /client/proc/allow_character_respawn(selection in get_ghosts_by_key())
-	set category = "Special Verbs"
+	set category = "Server"
 	set name = "Allow player to respawn"
 	set desc = "Allows the player bypass the wait to respawn or allow them to re-enter their corpse."
 
@@ -494,7 +494,7 @@ Ccomp's first proc.
 	SSstatistics.add_field_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_rejuvenate(mob/living/M as mob in SSmobs.mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Rejuvenate"
 	if(!holder)
 		to_chat(src, "Only administrators may use this command.")
@@ -513,7 +513,7 @@ Ccomp's first proc.
 	SSstatistics.add_field_details("admin_verb","REJU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_create_centcom_report()
-	set category = "Special Verbs"
+	set category = "Fun"
 	set name = "Create Command Report"
 
 	if(!holder)
@@ -681,7 +681,7 @@ Ccomp's first proc.
 	return
 
 /client/proc/cmd_admin_check_contents(mob/living/M as mob in SSmobs.mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Check Contents"
 
 	var/list/L = M.get_contents()
@@ -721,7 +721,7 @@ Ccomp's first proc.
 */
 
 /client/proc/toggle_view_range()
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Change View Range"
 	set desc = "switches between 1x and custom views"
 
@@ -735,7 +735,7 @@ Ccomp's first proc.
 
 /client/proc/admin_call_shuttle()
 
-	set category = "Admin"
+	set category = "Fun"
 	set name = "Call Evacuation"
 
 	if(!SSticker.mode || !evacuation_controller)
@@ -757,7 +757,7 @@ Ccomp's first proc.
 	return
 
 /client/proc/admin_cancel_shuttle()
-	set category = "Admin"
+	set category = "Fun"
 	set name = "Cancel Evacuation"
 
 	if(!check_rights(R_ADMIN))	return

code/modules/client/client_procs.dm

@@ -677,7 +677,7 @@
 
 /client/verb/toggle_status_bar()
 	set name = "Toggle Status Bar"
-	set category = "OOC"
+	set category = "Preferences"
 
 	show_status_bar = !show_status_bar