Merge branch 'master' into vplk-persist

2026-07-19 02:56:14 +01:00 · 2017-04-04 21:44:28 -04:00
parent 39cf9a9a9b 909b02444d
commit 47b41582c3
76 changed files with 1218 additions and 817 deletions
@@ -32,7 +32,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
 	pref.age                = sanitize_integer(pref.age, get_min_age(), get_max_age(), initial(pref.age))
 	pref.biological_gender  = sanitize_inlist(pref.biological_gender, get_genders(), pick(get_genders()))
 	pref.identifying_gender = (pref.identifying_gender in all_genders_define_list) ? pref.identifying_gender : pref.biological_gender
-	pref.real_name          = sanitize_name(pref.real_name, pref.species)
+	pref.real_name		= sanitize_name(pref.real_name, pref.species, is_FBP())
 	if(!pref.real_name)
 		pref.real_name      = random_name(pref.identifying_gender, pref.species)
 	pref.spawnpoint         = sanitize_inlist(pref.spawnpoint, spawntypes, initial(pref.spawnpoint))
@@ -76,7 +76,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
 	if(href_list["rename"])
 		var/raw_name = input(user, "Choose your character's name:", "Character Name")  as text|null
 		if (!isnull(raw_name) && CanUseTopic(user))
-			var/new_name = sanitize_name(raw_name, pref.species)
+			var/new_name = sanitize_name(raw_name, pref.species, is_FBP())
 			if(new_name)
 				pref.real_name = new_name
 				return TOPIC_REFRESH
@@ -676,6 +676,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 	while(null in pref.rlimb_data)
 		pref.rlimb_data -= null

+	// Sanitize the name so that there aren't any numbers sticking around.
+	pref.real_name          = sanitize_name(pref.real_name, pref.species)
+	if(!pref.real_name)
+		pref.real_name      = random_name(pref.identifying_gender, pref.species)
+
 /datum/category_item/player_setup_item/general/body/proc/SetSpecies(mob/user)
 	if(!pref.species_preview || !(pref.species_preview in all_species))
 		pref.species_preview = "Human"
@@ -1,7 +1,7 @@
 // Suit slot
 /datum/gear/suit
 	display_name = "apron, blue"
-	path = /obj/item/clothing/suit/apron
+	path = /obj/item/clothing/suit/storage/apron
 	slot = slot_wear_suit
 	sort_category = "Suits and Overwear"
 	cost = 2
@@ -149,7 +149,7 @@

 /datum/gear/suit/overalls
 	display_name = "overalls"
-	path = /obj/item/clothing/suit/apron/overalls
+	path = /obj/item/clothing/suit/storage/apron/overalls
 	cost = 1

 /datum/gear/suit/poncho
@@ -98,6 +98,11 @@
 /datum/gear/suit/job_trek/ds9_coat
 	display_name = "DS9 Overcoat (use uniform)"
 	path = /obj/item/clothing/suit/storage/trek/ds9
+	allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director",
+						"Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",
+						"Scientist","Roboticist","Xenobiologist","Atmospheric Technician",
+						"Station Engineer","Warden","Detective","Security Officer")
+

 /datum/gear/uniform/job_trek/cmd/ds9
 	display_name = "DS9 uniform, cmd"
@@ -144,4 +149,4 @@ Swimsuits
 	for(var/swimsuit in typesof(/obj/item/weapon/storage/box/fluff/swimsuit))
 		var/obj/item/weapon/storage/box/fluff/swimsuit/swimsuit_type = swimsuit
 		swimsuits[initial(swimsuit_type.name)] = swimsuit_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(swimsuits))
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(swimsuits))
@@ -0,0 +1,48 @@
+// Define a place to save in character setup
+/datum/preferences
+	var/vantag_volunteer = 0	// What state I want to be in, in terms of being affected by antags.
+	var/vantag_preference = VANTAG_NONE	// Whether I'd like to volunteer to be an antag at some point.
+
+// Definition of the stuff for Sizing
+/datum/category_item/player_setup_item/vore/vantag
+	name = "VS Events"
+	sort_order = 6
+
+/datum/category_item/player_setup_item/vore/vantag/load_character(var/savefile/S)
+	S["vantag_volunteer"]	>> pref.vantag_volunteer
+	S["vantag_preference"]	>> pref.vantag_preference
+
+/datum/category_item/player_setup_item/vore/vantag/save_character(var/savefile/S)
+	S["vantag_volunteer"]	<< pref.vantag_volunteer
+	S["vantag_preference"]	<< pref.vantag_preference
+
+/datum/category_item/player_setup_item/vore/vantag/sanitize_character()
+	pref.vantag_volunteer	= sanitize_integer(pref.vantag_volunteer, 0, 1, initial(pref.vantag_volunteer))
+	pref.vantag_preference	= sanitize_inlist(pref.vantag_preference, vantag_choices_list, initial(pref.vantag_preference))
+
+/datum/category_item/player_setup_item/vore/vantag/copy_to_mob(var/mob/living/carbon/human/character)
+	if(character && !istype(character,/mob/living/carbon/human/dummy))
+		character.vantag_pref = pref.vantag_preference
+		BITSET(character.hud_updateflag, VANTAG_HUD)
+
+/datum/category_item/player_setup_item/vore/vantag/content(var/mob/user)
+	. += "<br>"
+	. += "<b>Event Volunteer:</b> <a href='?src=\ref[src];toggle_vantag_volunteer=1'><b>[pref.vantag_volunteer ? "Yes" : "No"]</b></a><br>"
+	. += "<b>Event Pref:</b> <a href='?src=\ref[src];change_vantag=1'><b>[vantag_choices_list[pref.vantag_preference]]</b></a><br>"
+
+/datum/category_item/player_setup_item/vore/vantag/OnTopic(var/href, var/list/href_list, var/mob/user)
+	if(href_list["toggle_vantag_volunteer"])
+		pref.vantag_volunteer = pref.vantag_volunteer ? 0 : 1
+		return TOPIC_REFRESH
+
+	else if(href_list["change_vantag"])
+		var/list/names_list = list()
+		for(var/C in vantag_choices_list)
+			names_list[vantag_choices_list[C]] = C
+
+		var/selection = input(user, "How do you want to be involved with VS Event Characters, ERP-wise? They will see this choice on you in a HUD. Event characters are admin-selected and spawned players, possibly with assigned objectives, who are obligated to respect ERP prefs and RP their actions like any other player, though it may be a slightly shorter RP if they are pressed for time or being caught.", "Event Preference") as null|anything in names_list
+		if(selection && selection != "Normal")
+			pref.vantag_preference = names_list[selection]
+
+		return TOPIC_REFRESH
+	return ..()