Adds Security Assistants!

code/__DEFINES/access.dm

@@ -290,8 +290,8 @@
 	ACCESS_COURT, \
 	ACCESS_CREMATORIUM, \
 	ACCESS_DETECTIVE, \
-	ACCESS_ENGINE_EQUIP, \
 	ACCESS_ENGINEERING, \
+	ACCESS_ENGINE_EQUIP, \
 	ACCESS_EXTERNAL_AIRLOCKS, \
 	ACCESS_GENETICS, \
 	ACCESS_HYDROPONICS, \
@@ -300,11 +300,11 @@
 	ACCESS_LAWYER, \
 	ACCESS_LIBRARY, \
 	ACCESS_MAINT_TUNNELS, \
-	ACCESS_MECH_MINING, \
+	ACCESS_MECH_ENGINE, \
 	ACCESS_MECH_MEDICAL, \
-	ACCESS_MECH_SECURITY, \
+	ACCESS_MECH_MINING, \
 	ACCESS_MECH_SCIENCE, \
-	ACCESS_MECH_ENGINE, \
+	ACCESS_MECH_SECURITY, \
 	ACCESS_MEDICAL, \
 	ACCESS_MINERAL_STOREROOM, \
 	ACCESS_MINING, \
@@ -313,6 +313,7 @@
 	ACCESS_NETWORK, \
 	ACCESS_ORDNANCE, \
 	ACCESS_ORDNANCE_STORAGE, \
+	ACCESS_PERMABRIG, \
 	ACCESS_PHARMACY, \
 	ACCESS_PLUMBING, \
 	ACCESS_PSYCHOLOGY, \
@@ -328,7 +329,7 @@
 	ACCESS_VIROLOGY, \
 	ACCESS_WEAPONS, \
 	ACCESS_XENOBIOLOGY, \
-)
+)  /* monkestation edit: add permabrig-only access */
 
 /// Command staff/secure accesses, think bridge/armoury, ai_upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND)
 #define COMMAND_ACCESS list( \
@@ -434,9 +435,11 @@
 	ACCESS_DETECTIVE, \
 	ACCESS_HOS, \
 	ACCESS_MECH_SECURITY, \
+	ACCESS_PERMABRIG, \
 	ACCESS_SECURITY, \
 	ACCESS_WEAPONS, \
-)
+) /* monkestation edit: add permabrig-only access */
+
 /// Name for the Medbay region.
 #define REGION_MEDBAY "Medbay"
 /// Used to seed the accesses_by_region list in SSid_access. A list of all medbay regional accesses that are overseen by the CMO.

code/__DEFINES/jobs.dm

@@ -152,7 +152,8 @@
 #define JOB_DISPLAY_ORDER_WARDEN 33
 #define JOB_DISPLAY_ORDER_DETECTIVE 34
 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 35
-#define JOB_DISPLAY_ORDER_PRISONER 36
+#define JOB_DISPLAY_ORDER_SECURITY_ASSISTANT 36 // monkestation edit: security assistants
+#define JOB_DISPLAY_ORDER_PRISONER 37
 
 
 #define DEPARTMENT_UNASSIGNED "No Department"

code/__DEFINES/~monkestation/access.dm

@@ -1 +1,6 @@
+/// Access to clockwork cult stuff.
+	//Special, for anything that's basically internal
 #define ACCESS_CLOCKCULT "clockcult"
+
+/// Access to permabrig. [ACCESS_BRIG] also grants permabrig access, this is just for ONLY permabrig accesss, for security assistants.
+#define ACCESS_PERMABRIG "permabrig"

code/__DEFINES/~monkestation/atom_hud.dm

@@ -0,0 +1 @@
+#define SECHUD_SECURITY_ASSISTANT "hudsecass"

code/__DEFINES/~monkestation/jobs.dm

@@ -0,0 +1 @@
+#define JOB_SECURITY_ASSISTANT "Security Assistant"

code/controllers/subsystem/id_access.dm

@@ -323,6 +323,7 @@ SUBSYSTEM_DEF(id_access)
 	desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold"
 	desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch"
 	desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den"
+	desc_by_access["[ACCESS_PERMABRIG]"] = "Permabrig" // monkestation edit: add permabrig-only access
 
 /**
  * Returns the access bitflags associated with any given access level.

code/datums/id_trim/jobs.dm

@@ -593,6 +593,7 @@
 		ACCESS_SERVICE,
 		ACCESS_SHIPPING,
 		ACCESS_WEAPONS,
+		ACCESS_PERMABRIG, // monkestation edit: add permabrig-only access
 		)
 	minimal_wildcard_access = list(
 		ACCESS_HOS,
@@ -939,6 +940,7 @@
 		ACCESS_MINERAL_STOREROOM,
 		ACCESS_SECURITY,
 		ACCESS_WEAPONS,
+		ACCESS_PERMABRIG, // monkestation edit: add permabrig-only access
 		)
 	extra_access = list(
 		ACCESS_DETECTIVE,
@@ -1151,6 +1153,7 @@
 		ACCESS_MINERAL_STOREROOM,
 		ACCESS_SECURITY,
 		ACCESS_WEAPONS,
+		ACCESS_PERMABRIG, // monkestation edit: add permabrig-only access
 		) // See /datum/job/warden/get_access()
 	extra_access = list(
 		ACCESS_DETECTIVE,

code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm

@@ -65,6 +65,7 @@
 		JOB_HEAD_OF_PERSONNEL,
 		JOB_HEAD_OF_SECURITY,
 		JOB_SECURITY_OFFICER,
+		JOB_SECURITY_ASSISTANT,
 		JOB_WARDEN,
 	)
 	restricted_roles = list(
@@ -104,6 +105,7 @@
 		JOB_QUARTERMASTER,
 		JOB_RESEARCH_DIRECTOR,
 		JOB_SECURITY_OFFICER,
+		JOB_SECURITY_ASSISTANT,
 		JOB_WARDEN,
 	)
 	enemy_roles = list(
@@ -201,6 +203,7 @@
 		JOB_HEAD_OF_SECURITY,
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
+		JOB_SECURITY_ASSISTANT,
 		JOB_WARDEN,
 	)
 	restricted_roles = list(

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -225,6 +225,7 @@
 		JOB_HEAD_OF_SECURITY,
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
+		JOB_SECURITY_ASSISTANT,
 		JOB_WARDEN,
 	)
 	restricted_roles = list(
@@ -437,6 +438,7 @@
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
 		JOB_WARDEN,
+		JOB_SECURITY_ASSISTANT,
 	)
 	restricted_roles = list(
 		JOB_AI,

code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm

@@ -113,6 +113,7 @@
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
 		JOB_WARDEN,
+		JOB_SECURITY_ASSISTANT,
 	)
 	restricted_roles = list(
 		JOB_AI,
@@ -170,6 +171,7 @@
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
 		JOB_WARDEN,
+		JOB_SECURITY_ASSISTANT,
 	)
 	restricted_roles = list(
 		JOB_AI,
@@ -226,6 +228,7 @@
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
 		JOB_WARDEN,
+		JOB_SECURITY_ASSISTANT,
 	)
 	restricted_roles = list(
 		JOB_AI,

code/game/machinery/computer/crew.dm

@@ -105,6 +105,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		JOB_SECURITY_OFFICER_SCIENCE = 15,
 		JOB_SECURITY_OFFICER_SUPPLY = 16,
 		JOB_DETECTIVE = 17,
+		JOB_SECURITY_ASSISTANT = 18, // monkestation edit: add security assistants
 		// 20-29: Medbay
 		JOB_CHIEF_MEDICAL_OFFICER = 20,
 		JOB_CHEMIST = 21,

code/modules/antagonists/traitor/objectives/destroy_heirloom.dm

@@ -83,6 +83,8 @@
 		/datum/job/bartender,
 		/datum/job/cook,
 		/datum/job/curator,
+		// Monkestation edit: security assistants
+		/datum/job/security_assistant,
 	)
 
 /datum/traitor_objective/destroy_heirloom/rare

code/modules/vending/security.dm

@@ -34,6 +34,7 @@
 		/obj/item/clothing/head/guardmanhelmet = 1, //monkestation edit: Guardman
 		/obj/item/clothing/under/guardmanuniform = 1, //monkestation edit: Guardman
 		/obj/item/clothing/suit/armor/guardmanvest = 1, //monkestation edit: Guardman
+		/obj/item/citationinator = 3 // monkestation edit: security assistants
 	)
 	refill_canister = /obj/item/vending_refill/security
 	default_price = PAYCHECK_CREW

monkestation/code/game/objects/effects/landmark.dm

@@ -126,3 +126,6 @@
 /obj/effect/landmark/navigate_destination/centcom/dresser
 	location = "Dressing Room"
 
+/obj/effect/landmark/start/security_assistant
+	name = "Security Assistant"
+	icon_state = "Security Officer"

monkestation/code/modules/antagonists/traitor/objectives/kidnapping.dm

@@ -69,6 +69,8 @@
 		/datum/job/paramedic,
 		// Service
 		/datum/job/cook,
+		// Monkestation edit: security assistants
+		/datum/job/security_assistant,
 	)
 	alive_bonus = 4
 

monkestation/code/modules/bloodsuckers/bloodsucker/bloodsucker_ruleset.dm

@@ -12,7 +12,7 @@
 		// Command
 		JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER,
 		// Security
-		JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_DETECTIVE,
+		JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_SECURITY_ASSISTANT,
 		// Curator
 		JOB_CURATOR,
 	)
@@ -63,7 +63,7 @@
 	protected_roles = list(
 		JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY,
 		JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_DETECTIVE,
-		JOB_CURATOR,
+		JOB_CURATOR, JOB_SECURITY_ASSISTANT,
 	)
 	restricted_roles = list(JOB_AI, JOB_CYBORG, "Positronic Brain")
 	required_candidates = 1
@@ -112,7 +112,7 @@
 	protected_roles = list(
 		JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY,
 		JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_DETECTIVE,
-		JOB_CURATOR,
+		JOB_CURATOR, JOB_SECURITY_ASSISTANT,
 	)
 	restricted_roles = list(JOB_AI, JOB_CYBORG)
 	required_candidates = 1

monkestation/code/modules/bloodsuckers/monster_hunters/hunter_rulesets.dm

@@ -22,6 +22,7 @@ GLOBAL_LIST_INIT(monster_antagonist_types, list(
 		JOB_HEAD_OF_SECURITY,
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
+		JOB_SECURITY_ASSISTANT,
 		JOB_WARDEN,
 		JOB_CHIEF_ENGINEER,
 		JOB_CHIEF_MEDICAL_OFFICER,

monkestation/code/modules/jobs/job_types/security_assistant.dm

@@ -0,0 +1,91 @@
+/datum/job/security_assistant
+	title = JOB_SECURITY_ASSISTANT
+	description = "Fine people for trivial things. Be an glorified hall monitor."
+	auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY
+	department_head = list(JOB_HEAD_OF_SECURITY)
+	faction = FACTION_STATION
+	total_positions = 5
+	spawn_positions = 5
+	supervisors = "the Head of Security, the Warden, and any proper security officers"
+	minimal_player_age = 7
+	exp_requirements = 300
+	exp_required_type = EXP_TYPE_CREW
+	exp_granted_type = EXP_TYPE_CREW
+	config_tag = "SECURITY_ASSISTANT"
+
+	outfit = /datum/outfit/job/security_assistant
+	plasmaman_outfit = /datum/outfit/plasmaman/security
+
+	paycheck = PAYCHECK_CREW
+	paycheck_department = ACCOUNT_SEC
+
+	liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
+
+	display_order = JOB_DISPLAY_ORDER_SECURITY_ASSISTANT
+	bounty_types = CIV_JOB_SEC
+	departments_list = list(/datum/job_department/security)
+
+	family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec)
+
+	mail_goodies = list(
+		/obj/item/food/donut/caramel = 10,
+		/obj/item/food/donut/matcha = 10,
+		/obj/item/food/donut/blumpkin = 5
+	)
+	rpg_title = "Guard"
+	job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN
+
+	alt_titles = list(
+		"Security Assistant",
+		"Deputy",
+		"Hall Monitor",
+		"Assistant Officer",
+		"Professional Snitch"
+	)
+
+/datum/outfit/job/security_assistant
+	name = "Security Assistant"
+	jobtype = /datum/job/security_assistant
+
+	id_trim = /datum/id_trim/job/security_assistant
+	uniform = /obj/item/clothing/under/rank/security/officer/grey
+	backpack_contents = list(
+		/obj/item/restraints/handcuffs/cable/zipties = 1,
+		/obj/item/reagent_containers/spray/pepper = 1
+	)
+	belt = /obj/item/modular_computer/pda/security
+	ears = /obj/item/radio/headset/headset_sec
+	shoes = /obj/item/clothing/shoes/sneakers/black
+	l_pocket = /obj/item/citationinator
+	r_pocket = /obj/item/assembly/flash/handheld
+	glasses = /obj/item/clothing/glasses/hud/security
+	gloves = /obj/item/clothing/gloves/tackler/dolphin
+
+	backpack = /obj/item/storage/backpack/security
+	satchel = /obj/item/storage/backpack/satchel/sec
+	duffelbag = /obj/item/storage/backpack/duffelbag/sec
+
+	box = /obj/item/storage/box/survival/security
+
+	implants = list(/obj/item/implant/mindshield) // i think this is stupid but this was apparently agreed upon ~lucy
+
+/datum/id_trim/job/security_assistant
+	assignment = "Security Assistant"
+	trim_state = "trim_secass"
+	department_color = COLOR_SECURITY_RED
+	subdepartment_color = COLOR_SECURITY_RED
+	sechud_icon_state = SECHUD_SECURITY_ASSISTANT
+	minimal_access = list(
+		ACCESS_BRIG_ENTRANCE,
+		ACCESS_SECURITY,
+		ACCESS_PERMABRIG
+	)
+	extra_access = list(
+		ACCESS_MAINT_TUNNELS
+	)
+	template_access = list(
+		ACCESS_CAPTAIN,
+		ACCESS_CHANGE_IDS,
+		ACCESS_HOS
+	)
+	job = /datum/job/security_assistant

monkestation/code/modules/mapping/access_helpers.dm

@@ -27,3 +27,7 @@
 
 /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/west_offset
 	offset_dir = WEST
+
+/obj/effect/mapping_helpers/airlock/access/any/security/permabrig/get_access()
+	. = ..()
+	. += list(ACCESS_PERMABRIG, ACCESS_BRIG)