Merge branch 'Safety-Tether' of https://github.com/haha26315/Hyper-Station-13 into Safety-Tether

hyperstation/code/modules/jobs/job_types/roleplay.dm

@@ -1,7 +1,19 @@
-/*
-Roleplay Jobs, Currently borked.
+GLOBAL_LIST_INIT(roleplay_positions, list(
+	"Central Command Inspector",
+	"Prisoner"))
 
-/datum/job/rpcentral
+/datum/job/roleplay/
+	var/info_text = "Debug Text on What the Job does."
+	var/quest_info = "To be the very best, like noone ever was."
+	var/failure_info = "To suck."
+	department_flag = ROLEPLAY
+	loadout = FALSE
+
+//Central Command Inspector
+////////////////////////////////////////////
+GLOBAL_LIST_EMPTY(rpcentralspawn) //required for late game spawning
+
+/datum/job/roleplay/rpcentral
 	title = "Central Command Inspector"
 	faction = "Station"
 	total_positions = 1
@@ -9,5 +21,63 @@ Roleplay Jobs, Currently borked.
 	minimal_player_age = 1
 	supervisors = "central command"
 	selection_color = "#ffeef0"
-	custom_spawn_text = "You are from central command doing a routine inspection of the station, please fill out the provided information and submit it to central command by the end of the shift."
-*/
+	info_text = "A offical from Central Command, performing a routine inspection of the station."
+	quest_info = "Complete a routine check of the station, And make a write up for your bosses. The information collected should be submitted to Central Command before the end of the shift. Notify the crew ahead of time for initating."
+	failure_info = "Failure to fill in the form correctly will face severe penalties from Command."
+	outfit = /datum/outfit/centcom_official
+	override_roundstart_spawn = /obj/effect/landmark/start/rpcentral
+
+/datum/job/roleplay/rpcentral/override_latejoin_spawn()
+	return TRUE
+
+/datum/job/roleplay/rpcentral/after_spawn(mob/H, mob/M, latejoin)
+	H.Move(pick(GLOB.rpcentralspawn))
+	H.forceMove(pick(GLOB.rpcentralspawn))
+
+/obj/effect/landmark/start/rpcentral
+	name = "Central Command Inspector"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "snukeop_leader_spawn"
+
+/obj/effect/landmark/start/rpcentral/Initialize(mapload)
+	..()
+	GLOB.rpcentralspawn += loc
+	return INITIALIZE_HINT_QDEL
+
+//Prisoner
+////////////////////////////////////////////
+GLOBAL_LIST_EMPTY(prisionspawn)
+
+/datum/job/roleplay/prisoner
+	title = "Prisoner"
+	faction = "Station"
+	total_positions = 3
+	spawn_positions = 1
+	minimal_player_age = 1
+	supervisors = "security"
+	selection_color = "#ffeef0"
+	info_text = "For one reason or another, you are a prisoner. Kinaris has chosen to temporarily hold you within Layenia Station's holding area, \
+	until the end of the shift. You do not permanently reside here, but you may end up in this place from shift to shift. It is highly recommended to \
+	make a unique character slot for this role. Kinaris would not neuter or otherwise remove identifying features that make you who you are; such as \
+	altering your name, features, or physical appearance. As a prisoner, you still uphold a decent amount of rights."
+	quest_info = "Do NOT attempt to break out, antagonize, or otherwise treat your role as anything to grief with. Should you find a scenario where you want to, AHELP."
+	failure_info = ""
+	outfit = /datum/outfit/prisoner
+
+/datum/job/roleplay/prisoner/override_latejoin_spawn()
+	return TRUE
+
+/datum/job/roleplay/prisoner/after_spawn(mob/H, mob/M, latejoin)
+	AnnounceArrival(H, title)
+	H.Move(pick(GLOB.prisionspawn))
+	H.forceMove(pick(GLOB.prisionspawn))
+
+/obj/effect/landmark/start/prisoner
+	name = "Central Command Inspector"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "snukeop_leader_spawn"
+
+/obj/effect/landmark/start/prisoner/Initialize(mapload)
+	..()
+	GLOB.prisionspawn += loc
+	return INITIALIZE_HINT_QDEL

hyperstation/code/modules/mob/dead/new_player/sprite_accessories.dm

@@ -437,7 +437,7 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
 	name = "RadDog (Hyper)"
 	icon_state = "chemlight"
 	icon = 'hyperstation/icons/mob/char_markings.dmi'
-	
+
 //racc do a code maybe it won't explode
 /datum/sprite_accessory/mam_body_markings/raccalt
 	name = "RaccAlt (Hyper)"
@@ -543,7 +543,7 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
 /datum/sprite_accessory/screen/visor/blue
 	name = "Blue Visor (Hyper)"
 	icon_state = "visor_blue"
-	
+
 /datum/sprite_accessory/screen/visor/green
 	name = "Green Visor (Hyper)"
 	icon_state = "visor_green"
@@ -559,7 +559,7 @@ from modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm:
 /datum/sprite_accessory/screen/visor/yellow
 	name = "Yellow Visor (Hyper)"
 	icon_state = "visor_yellow"
-	
+
 
 /*
 HAIRSTYLES
@@ -601,3 +601,18 @@ from code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm:
 /datum/sprite_accessory/hair/emoh
 	name = "Emo (Hyper)"
 	icon_state = "hair_emoh"
+
+/*
+BEARDS
+==========================================================
+*/
+
+/*
+/datum/sprite_accessory/facial_hair
+	icon = 'icons/mob/human_face.dmi'
+	gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P)
+*/
+
+/datum/sprite_accessory/facial_hair/mane
+	name = "Neckfluff (Hyper)"
+	icon_state = "facial_neckfluff"