Merge pull request #659 from TheFurryFeline/TFF-Clown_and_Mime_Access_Fix

Clown/Mime Shenanigans

code/game/jobs/access_datum.dm

@@ -256,9 +256,20 @@
 	desc = "Quartermaster"
 	region = ACCESS_REGION_SUPPLY
 
-// /var/const/free_access_id = 43
-// /var/const/free_access_id = 43
-// /var/const/free_access_id = 44
+// /var/const/free_access_id = 42
+//TFF 3/5/19 - Add const vars for clown/mime IDs.
+/var/const/access_clown = 43
+/datum/access/clown
+	id = access_clown
+	desc = "Clown"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_mime = 44
+/datum/access/mime
+	id = access_mime
+	desc = "Mime"
+	region = ACCESS_REGION_GENERAL
+
 
 /var/const/access_surgery = 45
 /datum/access/surgery

code/game/jobs/job/captain.dm

@@ -57,18 +57,19 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 	outfit_type = /decl/hierarchy/outfit/job/hop
 	alt_titles = list("Crew Resources Officer")
 
+	//TFF 3/5/19 - add clown/mime_access
 	access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce, access_keycard_auth, access_gateway)
+			            access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_clown, access_mime)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce, access_keycard_auth, access_gateway)
+			            access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_clown, access_mime)
 
 /datum/job/secretary
 	title = "Command Secretary"

code/game/jobs/job/special.dm

@@ -86,22 +86,26 @@
 		return access
 */
 
+//TFF 3/5/19 - allow selection of job pre-start. Also remove whitelist restriction and give Clowns access to their office.
 /datum/job/clown
 	title = "Clown"
 	flag = CLOWN
 	department = "Civilian"
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = -1
-	spawn_positions = -1
+	total_positions = 1
+	spawn_positions = 1
 	supervisors = "the spirit of laughter"
 	selection_color = "#515151"
 	economic_modifier = 1
-	access = list()
-	minimal_access = list()
+	idtype = /obj/item/weapon/card/id/civilian/clown
+	access = list(43)
+	minimal_access = list(43)
 	alt_titles = list("Comedian","Jester")
-	whitelist_only = 1
-	latejoin_only = 1
+//	whitelist_only = 1
+//	latejoin_only = 1
+
+	access = list(access_maint_tunnels, access_clown)
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -118,28 +122,27 @@
 
 		return 1
 
-/datum/job/clown/get_access()
-	if(config.assistant_maint)
-		return list(access_maint_tunnels)
-	else
-		return list()
-
+//TFF 3/5/19 - allow selection of job pre-start. Also remove whitelist restriction.
 /datum/job/mime
 	title = "Mime"
 	flag = MIME
 	department = "Civilian"
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = -1
-	spawn_positions = -1
+	total_positions = 1
+	spawn_positions = 1
 	supervisors = "the spirit of performance"
 	selection_color = "#515151"
 	economic_modifier = 1
-	access = list()
-	minimal_access = list()
+	idtype = /obj/item/weapon/card/id/civilian/mime
+	access = list(44)
+	minimal_access = list(44)
 	alt_titles = list("Performer","Interpretive Dancer")
-	whitelist_only = 1
-	latejoin_only = 1
+//	whitelist_only = 1
+//	latejoin_only = 1
+
+//TFF 3/5/19 - give Mimes access to their office
+	access = list(access_maint_tunnels, access_mime)
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -155,10 +158,4 @@
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H), slot_l_hand)
 
-		return 1
-
-/datum/job/mime/get_access()
-	if(config.assistant_maint)
-		return list(access_maint_tunnels)
-	else
-		return list()
+		return 1

code/game/jobs/job/z_all_jobs_vr.dm

@@ -50,6 +50,15 @@
 /datum/job/atmos
 	total_positions = 3
 	spawn_positions = 3
-	
+
 /datum/job/scientist
 	alt_titles = list("Xenoarcheologist", "Anomalist", "Phoron Researcher", "Circuit Designer")
+
+//TFF 3/5/19 - add clown/mime spawning defining stuff
+/datum/job/clown
+	total_positions = 1
+	spawn_positions = 1
+
+/datum/job/mime
+	total_positions = 1
+	spawn_positions = 1

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -149,17 +149,23 @@
 	item_state = "gold_id"
 	preserve_item = 1
 
+//TFF 3/5/19 - allow Captain to get into Clown/Mime Office. Why? Because they already have access to the rest of the station.
 /obj/item/weapon/card/id/gold/captain
 	assignment = "Colony Director"
 	rank = "Colony Director"
 	job_access_type = /datum/job/captain
 
+/obj/item/weapon/card/id/gold/captain/initialize()
+	. = ..()
+	access = get_all_station_access() + access_mime + access_clown
+
 /obj/item/weapon/card/id/gold/captain/spare
 	name = "\improper Colony Director's spare ID"
 	desc = "The spare ID of the High Lord himself."
 	registered_name = "Colony Director"
 	job_access_type = /datum/job/captain
 
+//TFF 3/5/19 - allow borgs/drones to get into Clown/Mime Office. Why? Because they already have access to the rest of the station.
 /obj/item/weapon/card/id/synthetic
 	name = "\improper Synthetic ID"
 	desc = "Access module for NanoTrasen Synthetics"
@@ -169,7 +175,7 @@
 
 /obj/item/weapon/card/id/synthetic/initialize()
 	. = ..()
-	access = get_all_station_access() + access_synth
+	access = get_all_station_access() + access_clown + access_mime + access_synth
 
 /obj/item/weapon/card/id/centcom
 	name = "\improper CentCom. ID"
@@ -424,3 +430,14 @@
 	icon_state = "permit"
 	primary_color = rgb(142,94,0)
 	secondary_color = rgb(191,159,95)
+
+//TFF 3/5/19 - allow clown/mime players to spawn in with real IDs and get into their places.
+/obj/item/weapon/card/id/civilian/clown
+	assignment = "Clown"
+	rank = "Clown"
+	job_access_type = /datum/job/clown
+
+/obj/item/weapon/card/id/civilian/mime
+	assignment = "Mime"
+	rank = "Mime"
+	job_access_type = /datum/job/mime