cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 12:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #6613 and #6492

Browse Source
This commit is contained in:
Zuhayr
2014-10-08 23:10:12 +10:30
parent 1249fb0592
commit 37cb78eefa
33 changed files with 185 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+2 -2
View File
@@ -1187,7 +1187,7 @@ datum/preferences
b_type = new_b_type
if("hair")
if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell")
if(species == "Human" || species == "Unathi" || species == "Tajara" || species == "Skrell")
var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as color|null
if(new_hair)
r_hair = hex2num(copytext(new_hair, 2, 4))
@@ -1267,7 +1267,7 @@ datum/preferences
s_tone = 35 - max(min( round(new_s_tone), 220),1)
if("skin")
if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
if(species == "Unathi" || species == "Tajara" || species == "Skrell")
var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference") as color|null
if(new_skin)
r_skin = hex2num(copytext(new_skin, 2, 4))
code/modules/client/preferences_gear.dm
+5 -3
View File
@@ -177,12 +177,14 @@ var/global/list/gear_datums = list()
cost = 2
slot = slot_head
// This was sprited and coded specifically for Zhan-Khazan characters. Before you
// decide that it's 'not even Taj themed' maybe you should read the wiki, gamer. ~ Z
/datum/gear/zhan_scarf
display_name = "headscarf, white"
display_name = "Zhan headscarf"
path = /obj/item/clothing/head/tajaran/scarf
cost = 2
slot = slot_head
// whitelisted = "Tajaran" // It's a headscarf. It isn't even a taj-themed headscarf!
whitelisted = "Tajara"
// Eyes
@@ -460,7 +462,7 @@ var/global/list/gear_datums = list()
path = /obj/item/clothing/suit/tajaran/furs
cost = 3
slot = slot_wear_suit
whitelisted = "Tajaran" // You do have a monopoly on a fur suit tho
whitelisted = "Tajara" // You do have a monopoly on a fur suit tho
// Gloves