added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios)

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2026-07-19 02:54:41 +01:00 · 2012-02-08 11:47:07 +10:00
parent 3a60e2100e
commit 22811eaf26
15 changed files with 9077 additions and 8735 deletions
@@ -784,74 +784,77 @@
 	switch(alert("You sure you wish to edit this mob's appearance?",,"Yes","No"))
 		if("No")
 			return
-	var/new_facial = input("Please select facial hair color.", "Character Generation") as color
-	if(new_facial)
-		M.r_facial = hex2num(copytext(new_facial, 2, 4))
-		M.g_facial = hex2num(copytext(new_facial, 4, 6))
-		M.b_facial = hex2num(copytext(new_facial, 6, 8))
+	if(istype(M,/mob/living/carbon/human/tajaran))
+		usr << "\red Tajarans do not have an editable appearance... yet!"
+	else
+		var/new_facial = input("Please select facial hair color.", "Character Generation") as color
+		if(new_facial)
+			M.r_facial = hex2num(copytext(new_facial, 2, 4))
+			M.g_facial = hex2num(copytext(new_facial, 4, 6))
+			M.b_facial = hex2num(copytext(new_facial, 6, 8))

-	var/new_hair = input("Please select hair color.", "Character Generation") as color
-	if(new_facial)
-		M.r_hair = hex2num(copytext(new_hair, 2, 4))
-		M.g_hair = hex2num(copytext(new_hair, 4, 6))
-		M.b_hair = hex2num(copytext(new_hair, 6, 8))
+		var/new_hair = input("Please select hair color.", "Character Generation") as color
+		if(new_facial)
+			M.r_hair = hex2num(copytext(new_hair, 2, 4))
+			M.g_hair = hex2num(copytext(new_hair, 4, 6))
+			M.b_hair = hex2num(copytext(new_hair, 6, 8))

-	var/new_eyes = input("Please select eye color.", "Character Generation") as color
-	if(new_eyes)
-		M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
-		M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
-		M.b_eyes = hex2num(copytext(new_eyes, 6, 8))
+		var/new_eyes = input("Please select eye color.", "Character Generation") as color
+		if(new_eyes)
+			M.r_eyes = hex2num(copytext(new_eyes, 2, 4))
+			M.g_eyes = hex2num(copytext(new_eyes, 4, 6))
+			M.b_eyes = hex2num(copytext(new_eyes, 6, 8))

-	var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation")  as text
+		var/new_tone = input("Please select skin tone level: 1-220 (1=albino, 35=caucasian, 150=black, 220='very' black)", "Character Generation")  as text

-	if (new_tone)
-		M.s_tone = max(min(round(text2num(new_tone)), 220), 1)
-		M.s_tone =  -M.s_tone + 35
+		if (new_tone)
+			M.s_tone = max(min(round(text2num(new_tone)), 220), 1)
+			M.s_tone =  -M.s_tone + 35

-	// hair
-	var/list/all_hairs = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair
-	var/list/hairs = list()
+		// hair
+		var/list/all_hairs = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair
+		var/list/hairs = list()

-	// loop through potential hairs
-	for(var/x in all_hairs)
-		var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
-		hairs.Add(H.name) // add hair name to hairs
-		del(H) // delete the hair after it's all done
+		// loop through potential hairs
+		for(var/x in all_hairs)
+			var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
+			hairs.Add(H.name) // add hair name to hairs
+			del(H) // delete the hair after it's all done

-	var/new_style = input("Please select hair style", "Character Generation")  as null|anything in hairs
+		var/new_style = input("Please select hair style", "Character Generation")  as null|anything in hairs

-	// if new style selected (not cancel)
-	if (new_style)
-		M.h_style = new_style
+		// if new style selected (not cancel)
+		if (new_style)
+			M.h_style = new_style

-		for(var/x in all_hairs) // loop through all_hairs again. Might be slightly CPU expensive, but not significantly.
-			var/datum/sprite_accessory/hair/H = new x // create new hair datum
-			if(H.name == new_style)
-				M.hair_style = H // assign the hair_style variable a new hair datum
-				break
-			else
-				del(H) // if hair H not used, delete. BYOND can garbage collect, but better safe than sorry
+			for(var/x in all_hairs) // loop through all_hairs again. Might be slightly CPU expensive, but not significantly.
+				var/datum/sprite_accessory/hair/H = new x // create new hair datum
+				if(H.name == new_style)
+					M.hair_style = H // assign the hair_style variable a new hair datum
+					break
+				else
+					del(H) // if hair H not used, delete. BYOND can garbage collect, but better safe than sorry

-	// facial hair
-	var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair
-	var/list/fhairs = list()
+		// facial hair
+		var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair
+		var/list/fhairs = list()

-	for(var/x in all_fhairs)
-		var/datum/sprite_accessory/facial_hair/H = new x
-		fhairs.Add(H.name)
-		del(H)
-
-	new_style = input("Please select facial style", "Character Generation")  as null|anything in fhairs
-
-	if(new_style)
-		M.f_style = new_style
 		for(var/x in all_fhairs)
 			var/datum/sprite_accessory/facial_hair/H = new x
-			if(H.name == new_style)
-				M.facial_hair_style = H
-				break
-			else
-				del(H)
+			fhairs.Add(H.name)
+			del(H)
+
+		new_style = input("Please select facial style", "Character Generation")  as null|anything in fhairs
+
+		if(new_style)
+			M.f_style = new_style
+			for(var/x in all_fhairs)
+				var/datum/sprite_accessory/facial_hair/H = new x
+				if(H.name == new_style)
+					M.facial_hair_style = H
+					break
+				else
+					del(H)

 	var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
 	if (new_gender)