cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6819 from KasparoVy/Kidan-Antennae-Colourable-Skrell

Browse Source 
Kidan Antennae + Greyscaled & Darkened Skrell
This commit is contained in:
Fox McCloud
2017-03-27 04:40:30 -04:00
committed by GitHub
parent eba2a5167d d8d95b6fd0
commit 05e73f30eb
8 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences.dm
+4 -4
View File
@@ -302,7 +302,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
dat += "<h2>Hair & Accessories</h2>"
if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species that have head accessories.
if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine", "Kidan")) //Species that have head accessories.
var/headaccessoryname = "Head Accessory: "
if(species == "Unathi")
headaccessoryname = "Horns: "
@@ -862,7 +862,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/datum/browser/popup = new(user, "records", "<div align='center'>Character Records</div>", 350, 300)
popup.set_content(HTML)
popup.open(0)
popup.open(0)
/datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
return player_alt_titles.Find(job.title) > 0 \
@@ -1425,7 +1425,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
h_style = new_h_style
if("headaccessory")
if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine", "Kidan")) //Species with head accessories.
var/input = "Choose the colour of your your character's head accessory:"
var/new_head_accessory = input(user, input, "Character Preference", rgb(r_headacc, g_headacc, b_headacc)) as color|null
if(new_head_accessory)
@@ -1434,7 +1434,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
b_headacc = color2B(new_head_accessory)
if("ha_style")
if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine")) //Species with head accessories.
if(species in list("Unathi", "Vulpkanin", "Tajaran", "Machine", "Kidan")) //Species with head accessories.
var/list/valid_head_accessory_styles = list()
for(var/head_accessory_style in head_accessory_styles_list)
var/datum/sprite_accessory/H = head_accessory_styles_list[head_accessory_style]
code/modules/mob/living/carbon/human/species/station.dm
+9 -3
View File
@@ -56,7 +56,8 @@
reagent_tag = PROCESS_ORG
base_color = "#066000"
//Default styles for created mobs.
default_hair = "Unathi Horns"
default_headacc = "Simple"
default_headacc_colour = "#404040"
butt_sprite = "unathi"
has_organ = list(
@@ -214,6 +215,9 @@
dietflags = DIET_HERB
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
base_color = "#38b661" //RGB: 56, 182, 97.
default_hair_colour = "#38b661"
eyes = "skrell_eyes_s"
//Default styles for created mobs.
default_hair = "Skrell Male Tentacles"
reagent_tag = PROCESS_ORG
@@ -481,11 +485,13 @@
flags = IS_WHITELISTED
clothing_flags = HAS_SOCKS
bodyflags = FEET_CLAWS
eyes = "kidan_eyes"
bodyflags = FEET_CLAWS | HAS_HEAD_ACCESSORY
eyes = "kidan_eyes_s"
dietflags = DIET_HERB
blood_color = "#FB9800"
reagent_tag = PROCESS_ORG
//Default styles for created mobs.
default_headacc = "Normal Antennae"
butt_sprite = "kidan"
has_organ = list(
code/modules/mob/new_player/sprite_accessories.dm
+44 -1
View File
@@ -1626,7 +1626,7 @@
/datum/sprite_accessory/head_accessory/none
name = "None"
species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton", "Vox")
species_allowed = list("Human", "Unathi", "Diona", "Grey", "Kidan", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton", "Vox")
icon_state = "accessory_none"
/datum/sprite_accessory/head_accessory/unathi
@@ -1749,6 +1749,48 @@
name = "Head Light"
icon_state = "light"
/datum/sprite_accessory/head_accessory/kidan
icon = 'icons/mob/human_face.dmi'
species_allowed = list("Kidan")
over_hair = 1
do_colouration = 0
/datum/sprite_accessory/head_accessory/kidan/perked_antennae
name = "Perked-up Antennae"
icon_state = "kidan_perky"
/datum/sprite_accessory/head_accessory/kidan/mopey_antennae
name = "Mopey Antennae"
icon_state = "kidan_mopey"
/datum/sprite_accessory/head_accessory/kidan/curious_antennae
name = "Curious Antennae"
icon_state = "kidan_curious"
/datum/sprite_accessory/head_accessory/kidan/mopey_antennae
name = "Mopey Antennae"
icon_state = "kidan_mopey"
/datum/sprite_accessory/head_accessory/kidan/crescent_antennae
name = "Crescent Antennae"
icon_state = "kidan_crescent"
/datum/sprite_accessory/head_accessory/kidan/alert_antennae
name = "Alert Antennae"
icon_state = "kidan_alert"
/datum/sprite_accessory/head_accessory/kidan/normal_antennae
name = "Normal Antennae"
icon_state = "kidan_normal"
/datum/sprite_accessory/head_accessory/kidan/long_antennae
name = "Long Antennae"
icon_state = "kidan_long"
/datum/sprite_accessory/head_accessory/kidan/moth_antennae
name = "Moth Antennae"
icon_state = "kidan_moth"
/* BODY MARKINGS */
@@ -1949,6 +1991,7 @@
/datum/sprite_accessory/body_markings/head/unathi/snout_lower_una_round
name = "Unathi Lower Round Snout"
icon_state = "markings_face_snout_lower_una"
heads_allowed = list("All")
/datum/sprite_accessory/body_markings/head/unathi/banded_una //Companion marking for Unathi Banded.
name = "Unathi Banded Head"