kills TIS

code/__DEFINES/job.dm

@@ -351,10 +351,10 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 
 #define RIOT_JOB_LIST list(JOB_RIOT, JOB_RIOT_CHIEF)
 //-------- UAAC --------//
-#define JOB_TIS_IO "UAAC-TIS Intelligence Officer"
-#define JOB_TIS_SA "UAAC-TIS Special Agent"
+#define JOB_UAACSOG_AGENT "UAAC-SOG Agent"
+#define JOB_UAACSOG_IO "UAAC-SOG Intelligence Officer"
 
-#define TIS_JOB_LIST list(JOB_TIS_SA, JOB_TIS_IO)
+#define UAACSOG_JOB_LIST list(JOB_UAACSOG_AGENT, JOB_UAACSOG_IO)
 //-------- DUTCH'S DOZEN --------//
 #define JOB_DUTCH_ARNOLD "Dutch's Dozen - Dutch"
 #define JOB_DUTCH_RIFLEMAN "Dutch's Dozen - Rifleman"

code/datums/emergency_calls/inspection.dm

@@ -78,48 +78,6 @@
 		to_chat(H, SPAN_WARNING("Remember, you may not interrupt regular operation and are expected to follow orders of the Inspector at all times. Ahelp if you have any questions of you wish to offer the role to someone else."))
 	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS)
 
-//UAAC-TIS
-/datum/emergency_call/inspection_tis
-	name = "Inspection - UA Allied Command TIS - ML Knowledge Required"
-	mob_max = 2
-	mob_min = 1
-	probability = 0
-
-/datum/emergency_call/inspection_tis/New()
-	..()
-	objectives = "Await detailed directives from your Handler. Remember that you may, but do not have to, investigate any ML or SOP related issues during your time on the [MAIN_SHIP_NAME]."
-
-/datum/emergency_call/inspection_tis/create_member(datum/mind/M, turf/override_spawn_loc)
-	var/turf/T = override_spawn_loc ? override_spawn_loc : get_spawn_point()
-
-	if(!istype(T))
-		return FALSE
-
-	var/mob/living/carbon/human/H = new(T)
-	M.transfer_to(H, TRUE)
-
-	if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_INTEL,JOB_WARDEN), time_required_for_job))
-		leader = H
-		arm_equipment(H, /datum/equipment_preset/uscm_event/uaac/tis/io, TRUE, TRUE)
-		to_chat(H, SPAN_ROLE_HEADER("You are an Intelligence Officer working for the UAAC-TIS!"))
-		to_chat(H, SPAN_ROLE_BODY("The UAAC-TIS, also known as the Three Eyes, is responsible for the collection, collation and delivery of Intelligence across UA assets. Your Handler will contact you about the exact nature of your mission on board the [MAIN_SHIP_NAME]."))
-		to_chat(H, SPAN_ROLE_BODY("While you do not have any direct authority over the USCM, the TIS mandate also allows you to investigate any perceived abuse of the Law, be it written or implied. Remember, you have the authority to make calls on ML should the crew of the Almayer request it or your Handler order you to resolve ML issues."))
-		to_chat(H, SPAN_WARNING("Remember that you cannot take antagonistic action unless specifically allowed by your Handler. You are also expected to know ML and SOP. Ahelp if you have any questions or wish to release this mob for other players."))
-	else
-		arm_equipment(H, /datum/equipment_preset/uscm_event/provost/enforcer, TRUE, TRUE)
-		to_chat(H, SPAN_ROLE_HEADER("You are an Enforcer of the USCM Provost Office!"))
-		to_chat(H, SPAN_ROLE_BODY("You have been assigned as an escort for an UAAC-TIS Officer being dispatched to the [MAIN_SHIP_NAME]. Technically, the TIS has no direct authority over you, however you have been ordered to follow the instructions of the TIS Officer."))
-		to_chat(H, SPAN_ROLE_BODY("You are not expected to enforce ML on the ship and are generally expected to follow the instruction of the Officer you are protecting. Remember that should they start acting in a way that you believe puts the USCM in danger, you are not obligated to follow their orders and should report this to the Provost at once."))
-		to_chat(H, SPAN_WARNING("This role requires familiarity with Marine Law and Standard Operating Procedure. Ahelp if you have any questions or wish to surrender the character to someone else."))
-	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS)
-
-/datum/emergency_call/inspection_tis/spawn_items()
-	var/turf/drop_spawn
-
-	drop_spawn = get_spawn_point(TRUE)
-	new /obj/item/storage/box/handcuffs(drop_spawn)
-	new /obj/item/storage/box/handcuffs(drop_spawn)
-
 //Weyland-Yutani
 /datum/emergency_call/inspection_wy
 	name = "Inspection - Corporate"

code/datums/factions/uscm.dm

@@ -143,9 +143,9 @@
 				marine_rk = "pvm"
 				border_rk = "command"
 			// TIS
-			if(JOB_TIS_IO)
+			if(JOB_UAACSOG_IO)
 				marine_rk = "tisio"
-			if(JOB_TIS_SA)
+			if(JOB_UAACSOG_AGENT)
 				marine_rk = "tissa"
 			// Riot MPs
 			if(JOB_RIOT)

code/datums/paygrades/factions/uscm/uaac.dm

@@ -0,0 +1,6 @@
+/datum/paygrade/uaac/agent
+	paygrade = "Agent"
+	name = "Agent"
+	prefix = "Agent"
+	ranking = 1
+	pay_multiplier = 3

code/game/jobs/role_authority.dm

@@ -60,9 +60,6 @@ var/global/players_preassigned = 0
 											/datum/job/antag,
 											/datum/job/special,
 											/datum/job/special/provost,
-											/datum/job/special/uaac,
-											/datum/job/special/uaac/tis,
-											/datum/job/special/uscm,
 											/datum/job/command/tank_crew //Rip VC
 											)
 	var/squads_all[] = typesof(/datum/squad) - /datum/squad

code/modules/clothing/head/head.dm

@@ -448,11 +448,6 @@
 	icon_state = "coblackberet"
 	desc = "A beret with the USCM Military Police insignia emblazoned on it."
 
-/obj/item/clothing/head/beret/marine/mp/tis
-	name = "\improper UAAC-TIS Special Agent Beret"
-	icon_state = "berettis"
-	desc = "A beret with the UAAC-TIS insignia emblazoned on it. A mark of a TIS Special Agent, these berets are one of the only pieces of equipment that the TIS actually manufactures for itself and earning one is one of the rare signs of achievement the Three Eyes allows."
-
 /obj/item/clothing/head/beret/marine/commander
 	name = "marine commanding officer beret"
 	desc = "A beret with the commanding officer's insignia emblazoned on it. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."

code/modules/clothing/suits/marine_armor.dm

@@ -1742,44 +1742,6 @@
 	item_state_slots = list(WEAR_JACKET = "pvlight_2")
 	storage_slots = 2
 
-//================//UNITED AMERICAS ALLIED COMMAND\\=====================\\
-//=======================================================================\\
-
-/obj/item/clothing/suit/storage/marine/uaac/tis/sa
-	name = "\improper M3 pattern UAAC-TIS Special Agent Armor"
-	desc = "A modified luxury armor, originally meant for a USCM Provost Marshall, modified to use the colors and insignia of the TIS. The Three Eyes is technically able to requisition any equipment or personnel to fulfill its mission and often uses this privilege to outfit their agents with high-quality gear from other UA military forces."
-	icon_state = "tis"
-	item_state_slots = list(WEAR_JACKET = "tis")
-	armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
-	armor_laser = CLOTHING_ARMOR_LOW
-	armor_energy = CLOTHING_ARMOR_LOW
-	armor_bomb = CLOTHING_ARMOR_MEDIUM
-	armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
-	storage_slots = 2
-	slowdown = SLOWDOWN_ARMOR_LIGHT
-	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
-	allowed = list(
-		/obj/item/weapon/gun,
-		/obj/item/tank/emergency_oxygen,
-		/obj/item/device/flashlight,
-		/obj/item/ammo_magazine/,
-		/obj/item/storage/fancy/cigarettes,
-		/obj/item/tool/lighter,
-		/obj/item/weapon/baton,
-		/obj/item/handcuffs,
-		/obj/item/explosive/grenade,
-		/obj/item/device/binoculars,
-		/obj/item/attachable/bayonet,
-		/obj/item/storage/backpack/general_belt,
-		/obj/item/device/hailer,
-		/obj/item/storage/belt/gun,
-		/obj/item/weapon/sword/ceremonial,
-		/obj/item/device/motiondetector,
-		/obj/item/device/walkman,
-	)
-	uniform_restricted = list(/obj/item/clothing/under/uaac/tis)
-
 //================//UNITED AMERICAS RIOT CONTROL\\=====================\\
 //=======================================================================\\
 

code/modules/clothing/under/marine_uniform.dm

@@ -392,32 +392,6 @@
 	icon_state = "provost_marshal"
 	worn_state = "provost_marshal"
 
-//==================//UNITED AMERICAS ALLIED COMMAND\\===================\\
-//=======================================================================\\
-
-/obj/item/clothing/under/uaac/tis
-	name = "\improper UAAC-TIS Special Agent Uniform"
-	desc = "A modified USCM Provost uniform, with its original insignia replaced by those of the UAAC-TIS Intelligence Service. TIS Special Agents are often recruited from the upper echelons of law enforcement agencies in various UA armed forces. These recruits often take all their gear, uniform included with them and later modify them to include TIS and UAAC insignia."
-	flags_jumpsuit = FALSE
-	flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
-	siemens_coefficient = 0.9
-	icon_state = "tis"
-	worn_state = "tis"
-	armor_melee = CLOTHING_ARMOR_LOW
-	armor_bullet = CLOTHING_ARMOR_LOW
-	armor_laser = CLOTHING_ARMOR_NONE
-	armor_energy = CLOTHING_ARMOR_NONE
-	armor_bomb = CLOTHING_ARMOR_NONE
-	armor_bio = CLOTHING_ARMOR_NONE
-	armor_rad = CLOTHING_ARMOR_NONE
-	armor_internaldamage = CLOTHING_ARMOR_LOW
-
-/obj/item/clothing/under/uaac/tis/io
-	name = "\improper UAAC-TIS Intelligence Officer uniform"
-	desc = "Originally a USCM officer uniform, all insignia have been carefully removed and replaced by a simple TIS pin worn over the right breast. Like their Special Agent counterparts, TIS Intel Officers are typically transplants from UA aligned armed forces, often initially recruited on a temporary basis then transferred permanently. As such, officers are often forced to adapt their original uniforms."
-	icon_state = "BO_jumpsuit"
-	worn_state = "BO_jumpsuit"
-	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 //=========================//USCM Survivors\\================================\\
 //=======================================================================\\
 

code/modules/gear_presets/uscm_event.dm

@@ -369,73 +369,68 @@
 
 /*****************************************************************************************************/
 
-/datum/equipment_preset/uscm_event/uaac/tis
-	name = "UAAC-TIS"
+/datum/equipment_preset/uscm_event/uaacsog
+	name = "UAAC-SOG"
 
-	idtype = /obj/item/card/id/provost
-	skills = /datum/skills/provost
-
-/datum/equipment_preset/uscm_event/uaac/tis/New()
-	. = ..()
-	access = get_access(ACCESS_LIST_MARINE_ALL)
-
-/datum/equipment_preset/uscm_event/uaac/tis/io
-	name = "UAAC-TIS Intelligence Officer (NO2)"
-	minimum_age = 25
+	idtype = /obj/item/card/id
 	skills = /datum/skills/intel
-
-	assignment = JOB_TIS_IO
-	rank = "UAAC-TIS Intelligence Officer"
-	paygrade = "NO2"
-	role_comm_title = "TIS-IO"
 	flags = EQUIPMENT_PRESET_EXTRA
 
-/datum/equipment_preset/uscm_event/uaac/tis/io/load_gear(mob/living/carbon/human/new_human)
-	var/back_item = /obj/item/storage/backpack/satchel/sec
-	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
-		back_item = /obj/item/storage/backpack/security
+/datum/equipment_preset/uscm_event/uaacsog/New()
+	. = ..()
+	access = get_access(ACCESS_LIST_MARINE_ALL)
 
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/uaac/tis/io(new_human), WEAR_BODY)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST)
+/datum/equipment_preset/uscm_event/uaacsog/agent
+	name = "UAAC-SOG Agent"
+	assignment = JOB_UAACSOG_AGENT
+	rank = JOB_UAACSOG_AGENT
+	paygrade = "Agent"
+	role_comm_title = "SOG"
+
+/datum/equipment_preset/uscm_event/uaacsog/agent/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/gray_blu(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey(new_human), WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET)
 	if(new_human.disabilities & NEARSIGHTED)
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
-	else
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
-	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
-
-/datum/equipment_preset/uscm_event/uaac/tis/sa
-	name = "UAAC-TIS Special Agent (NO5)"
-	minimum_age = 30
-	skills = /datum/skills/general
-
-	assignment = JOB_TIS_SA
-	rank = "UAAC-TIS Special Agent"
-	paygrade = "NO5"
-	role_comm_title = "TIS-SA"
-	flags = EQUIPMENT_PRESET_EXTRA
-
-/datum/equipment_preset/uscm_event/uaac/tis/sa/load_gear(mob/living/carbon/human/new_human)
-	var/back_item = /obj/item/storage/backpack/satchel/sec
-	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
-		back_item = /obj/item/storage/backpack/security
-
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/uaac/tis(new_human), WEAR_BODY)
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular/hipster(new_human), WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/pen(new_human), WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/folder(new_human), WEAR_IN_L_STORE)
+
+/datum/equipment_preset/uscm_event/uaacsog/agent/undercover
+	name = "UAAC-SOG Agent (Undercover)"
+	assignment = "Authorized Personnel"
+	rank = "Authorized Personnel"
+	paygrade = "C"
+	role_comm_title = "Gst."
+
+/datum/equipment_preset/uscm_event/uaacsog/intelligence
+	name = "UAAC-SOG Intelligence Officer"
+	assignment = JOB_UAACSOG_IO
+	rank = JOB_UAACSOG_IO
+	paygrade = "MO3"
+	role_comm_title = "SOG-IO"
+
+/datum/equipment_preset/uscm_event/uaacsog/intelligence/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/boiler(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/uaac/tis/sa(new_human), WEAR_JACKET)
 	if(new_human.disabilities & NEARSIGHTED)
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
-	else
-		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/tis(new_human), WEAR_HEAD)
-	new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(new_human), WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/pen(new_human), WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/folder(new_human), WEAR_IN_L_STORE)
 
 /*****************************************************************************************************/
 

code/modules/paperwork/folders.dm

@@ -34,6 +34,11 @@
 	. = ..()
 	icon_state = "folder_black[pick("_red", "_green", "_blue", "_yellow", "_white")]"
 
+/obj/item/folder/has_paper/Initialize()
+	. = ..()
+	for(var/i in 1 to rand(3, 5))
+		new /obj/item/paper(src)
+
 /obj/item/folder/Initialize()
 	. = ..()
 	if(updateicon)

colonialmarines.dme

@@ -604,6 +604,7 @@
 #include "code\datums\paygrades\factions\uscm\marine.dm"
 #include "code\datums\paygrades\factions\uscm\navy.dm"
 #include "code\datums\paygrades\factions\uscm\provost.dm"
+#include "code\datums\paygrades\factions\uscm\uaac.dm"
 #include "code\datums\paygrades\factions\wy\goons.dm"
 #include "code\datums\paygrades\factions\wy\pmc.dm"
 #include "code\datums\paygrades\factions\wy\wy.dm"
@@ -808,7 +809,6 @@
 #include "code\game\jobs\job\marine\squad\tl.dm"
 #include "code\game\jobs\job\special\cmb.dm"
 #include "code\game\jobs\job\special\provost.dm"
-#include "code\game\jobs\job\special\uaac.dm"
 #include "code\game\jobs\job\special\uscm.dm"
 #include "code\game\machinery\air_alarm.dm"
 #include "code\game\machinery\air_sensor.dm"