cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds an option to enable/disable markings on synth parts.

Browse Source
This commit is contained in:
Anewbe
2018-07-08 16:36:11 -05:00
committed by VirgoBot
parent fae4de5994
commit 5fff00c4d5
4 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -36,6 +36,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["synth_red"] >> pref.r_synth S["synth_red"] >> pref.r_synth
S["synth_green"] >> pref.g_synth S["synth_green"] >> pref.g_synth
S["synth_blue"] >> pref.b_synth S["synth_blue"] >> pref.b_synth
S["synth_markings"] >> pref.synth_markings
pref.preview_icon = null pref.preview_icon = null
S["bgstate"] >> pref.bgstate S["bgstate"] >> pref.bgstate
@@ -65,6 +66,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["synth_red"] << pref.r_synth S["synth_red"] << pref.r_synth
S["synth_green"] << pref.g_synth S["synth_green"] << pref.g_synth
S["synth_blue"] << pref.b_synth S["synth_blue"] << pref.b_synth
S["synth_markings"] << pref.synth_markings
S["bgstate"] << pref.bgstate S["bgstate"] << pref.bgstate
/datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S) /datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S)
@@ -120,6 +122,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
character.r_synth = pref.r_synth character.r_synth = pref.r_synth
character.g_synth = pref.g_synth character.g_synth = pref.g_synth
character.b_synth = pref.b_synth character.b_synth = pref.b_synth
character.synth_markings = pref.synth_markings
// Destroy/cyborgize organs and limbs. // Destroy/cyborgize organs and limbs.
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO)) for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
@@ -305,6 +308,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
. += "<br>" . += "<br>"
. += "<br>" . += "<br>"
. += "<b>Allow Synth markings:</b> <a href='?src=\ref[src];synth_markings=1'><b>[pref.synth_markings ? "Yes" : "No"]</b></a><br>"
. += "<b>Allow Synth color:</b> <a href='?src=\ref[src];synth_color=1'><b>[pref.synth_color ? "Yes" : "No"]</b></a><br>" . += "<b>Allow Synth color:</b> <a href='?src=\ref[src];synth_color=1'><b>[pref.synth_color ? "Yes" : "No"]</b></a><br>"
if(pref.synth_color) if(pref.synth_color)
. += "<a href='?src=\ref[src];synth2_color=1'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(pref.r_synth, 2)][num2hex(pref.g_synth, 2)][num2hex(pref.b_synth, 2)]'><table style='display:inline;' bgcolor='#[num2hex(pref.r_synth, 2)][num2hex(pref.g_synth, 2)][num2hex(pref.b_synth, 2)]'><tr><td>__</td></tr></table></font> " . += "<a href='?src=\ref[src];synth2_color=1'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(pref.r_synth, 2)][num2hex(pref.g_synth, 2)][num2hex(pref.b_synth, 2)]'><table style='display:inline;' bgcolor='#[num2hex(pref.r_synth, 2)][num2hex(pref.g_synth, 2)][num2hex(pref.b_synth, 2)]'><tr><td>__</td></tr></table></font> "
@@ -709,6 +713,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.b_synth = hex2num(copytext(new_color, 6, 8)) pref.b_synth = hex2num(copytext(new_color, 6, 8))
return TOPIC_REFRESH_UPDATE_PREVIEW return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["synth_markings"])
pref.synth_markings = !pref.synth_markings
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["cycle_bg"]) else if(href_list["cycle_bg"])
pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options) pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options)
return TOPIC_REFRESH_UPDATE_PREVIEW return TOPIC_REFRESH_UPDATE_PREVIEW

1
code/modules/client/preferences.dm
View File

@@ -60,6 +60,7 @@ datum/preferences
var/r_synth //Used with synth_color to color synth parts that normaly can't be colored. var/r_synth //Used with synth_color to color synth parts that normaly can't be colored.
var/g_synth //Same as above var/g_synth //Same as above
var/b_synth //Same as above var/b_synth //Same as above
var/synth_markings = 0 //Enable/disable markings on synth parts.
//Some faction information. //Some faction information.
var/home_system = "Unset" //System of birth. var/home_system = "Unset" //System of birth.

1
code/modules/mob/living/carbon/human/human_defines.dm
View File

@@ -30,6 +30,7 @@
var/r_synth //Used with synth_color to color synth parts that normaly can't be colored. var/r_synth //Used with synth_color to color synth parts that normaly can't be colored.
var/g_synth //Same as above var/g_synth //Same as above
var/b_synth //Same as above var/b_synth //Same as above
var/synth_markings = 0 //Enables/disables markings on synth parts.
//var/size_multiplier = 1 //multiplier for the mob's icon size //VOREStation Edit (Moved to /mob/living) //var/size_multiplier = 1 //multiplier for the mob's icon size //VOREStation Edit (Moved to /mob/living)
var/damage_multiplier = 1 //multiplies melee combat damage var/damage_multiplier = 1 //multiplies melee combat damage

11
code/modules/organs/organ_icon.dm
View File

@@ -179,6 +179,7 @@ var/global/list/limb_icon_cache = list()
if(model) if(model)
icon_cache_key += "_model_[model]" icon_cache_key += "_model_[model]"
apply_colouration(mob_icon) apply_colouration(mob_icon)
<<<<<<< HEAD
// VOREStation edit to enable markings on synths // VOREStation edit to enable markings on synths
for(var/M in markings) for(var/M in markings)
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
@@ -196,6 +197,16 @@ var/global/list/limb_icon_cache = list()
limb_icon_cache[cache_key] = I limb_icon_cache[cache_key] = I
mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY) mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
// VOREStation edit ends here // VOREStation edit ends here
=======
if(owner && owner.synth_markings)
for(var/M in markings)
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
mark_s.Blend(markings[M]["color"], ICON_ADD)
add_overlay(mark_s) //So when it's not on your body, it has icons
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
icon_cache_key += "[M][markings[M]["color"]]"
>>>>>>> 9e51c85... Merge pull request #5394 from Verkister/synthpaints
dir = EAST dir = EAST
icon = mob_icon icon = mob_icon