cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] makes it so the sanitize_hexcolors' default is 6 characters rather than 3 and gets rid of color_legacy [MDB IGNORE] (#8840)

Browse Source 
* makes it so the sanitize_hexcolors' default is 6 characters rather than 3 and gets rid of color_legacy

* Feex

* Feex some more

* Final feex

* Please no more I'm tired

* <<<<<<< HEAD

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-10-17 06:30:28 +02:00
committed by GitHub
parent a928f02179
commit f0db07b17d
42 changed files with 183 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/bodyparts/_bodyparts.dm
+13 -5
View File
@@ -850,7 +850,7 @@
species_color = ""
if(!dropping_limb && human_owner.dna.check_mutation(HULK))
mutation_color = "00aa00"
mutation_color = "#00aa00"
else
mutation_color = ""
@@ -962,9 +962,9 @@
if(should_draw_greyscale)
var/draw_color = mutation_color || species_color || (skin_tone && skintone2hex(skin_tone))
if(draw_color)
limb.color = "#[draw_color]"
limb.color = draw_color
if(aux_zone)
aux.color = "#[draw_color]"
aux.color = draw_color
if(blocks_emissive)
var/mutable_appearance/limb_em_block = emissive_blocker(limb.icon, limb.icon_state, alpha = limb.alpha)
limb_em_block.dir = image_dir
@@ -974,11 +974,19 @@
var/mutable_appearance/aux_em_block = emissive_blocker(aux.icon, aux.icon_state, alpha = aux.alpha)
aux_em_block.dir = image_dir
aux.overlays += aux_em_block
//Draw external organs like horns and frills
for(var/obj/item/organ/external/external_organ in external_organs)
if(!dropped && !external_organ.can_draw_on_bodypart(owner))
continue
//Some externals have multiple layers for background, foreground and between
for(var/external_layer in external_organ.all_layers)
if(external_organ.layers & external_layer)
external_organ.get_overlays(., image_dir, external_organ.bitflag_to_layer(external_layer), icon_gender, draw_color)
*/
//SKYRAT EDIT REMOVAL END
/obj/item/bodypart/deconstruct(disassembled = TRUE)
drop_organs()
qdel(src)
code/modules/surgery/bodyparts/head.dm
+9 -9
View File
@@ -27,11 +27,11 @@
//Limb appearance info:
var/real_name = "" //Replacement name
//Hair colour and style
var/hair_color = "000"
var/hair_color = "#000000"
var/hairstyle = "Bald"
var/hair_alpha = 255
//Facial hair colour and style
var/facial_hair_color = "000"
var/facial_hair_color = "#000000"
var/facial_hairstyle = "Shaved"
//Eye Colouring
@@ -159,7 +159,7 @@
if(owner_species.hair_color == "mutcolor")
facial_hair_color = human_head_owner.dna.features["mcolor"]
else if(hair_color == "fixedmutcolor")
facial_hair_color = "#[owner_species.fixed_mut_color]"
facial_hair_color = owner_species.fixed_mut_color
else
facial_hair_color = owner_species.hair_color
else
@@ -167,7 +167,7 @@
hair_alpha = owner_species.hair_alpha
else
facial_hairstyle = "Shaved"
facial_hair_color = "000"
facial_hair_color = "#000000"
hair_alpha = 255
//Hair
if(human_head_owner.hairstyle && (HAIR in owner_species.species_traits))
@@ -176,7 +176,7 @@
if(owner_species.hair_color == "mutcolor")
hair_color = human_head_owner.dna.features["mcolor"]
else if(hair_color == "fixedmutcolor")
hair_color = "#[owner_species.fixed_mut_color]"
hair_color = owner_species.fixed_mut_color
else
hair_color = owner_species.hair_color
else
@@ -184,7 +184,7 @@
hair_alpha = owner_species.hair_alpha
else
hairstyle = "Bald"
hair_color = "000"
hair_color = "#000000"
hair_alpha = initial(hair_alpha)
// lipstick
if(human_head_owner.lip_style && (LIPS in owner_species.species_traits))
@@ -216,7 +216,7 @@
var/datum/sprite_accessory/sprite = GLOB.facial_hairstyles_list[facial_hairstyle]
if(sprite)
var/image/facial_overlay = image(sprite.icon, "[sprite.icon_state]", -HAIR_LAYER, SOUTH)
facial_overlay.color = "#" + facial_hair_color
facial_overlay.color = facial_hair_color
facial_overlay.alpha = hair_alpha
. += facial_overlay
@@ -237,7 +237,7 @@
var/datum/sprite_accessory/sprite2 = GLOB.hairstyles_list[hairstyle]
if(sprite2)
var/image/hair_overlay = image(sprite2.icon, "[sprite2.icon_state]", -HAIR_LAYER, SOUTH)
hair_overlay.color = "#" + hair_color
hair_overlay.color = hair_color
hair_overlay.alpha = hair_alpha
. += hair_overlay
@@ -255,7 +255,7 @@
eyes_overlay.icon_state = eyes.eye_icon_state
if(eyes.eye_color)
eyes_overlay.color = "#" + eyes.eye_color
eyes_overlay.color = eyes.eye_color
/obj/item/bodypart/head/monkey
icon = 'icons/mob/animal_parts.dmi'
code/modules/surgery/bodyparts/helpers.dm
+13 -13
View File
@@ -190,31 +190,31 @@
. = 0
switch(skin_tone)
if("caucasian1")
. = "ffe0d1"
. = "#ffe0d1"
if("caucasian2")
. = "fcccb3"
. = "#fcccb3"
if("caucasian3")
. = "e8b59b"
. = "#e8b59b"
if("latino")
. = "d9ae96"
. = "#d9ae96"
if("mediterranean")
. = "c79b8b"
. = "#c79b8b"
if("asian1")
. = "ffdeb3"
. = "#ffdeb3"
if("asian2")
. = "e3ba84"
. = "#e3ba84"
if("arab")
. = "c4915e"
. = "#c4915e"
if("indian")
. = "b87840"
. = "#b87840"
if("african1")
. = "754523"
. = "#754523"
if("african2")
. = "471c18"
. = "#471c18"
if("albino")
. = "fff4e6"
. = "#fff4e6"
if("orange")
. = "ffc905"
. = "#ffc905"
/mob/living/carbon/proc/Digitigrade_Leg_Swap(swap_back)
var/body_plan_changed = FALSE
code/modules/surgery/organs/tails.dm
+1 -1
View File
@@ -84,7 +84,7 @@
..()
if(istype(tail_owner))
tail_owner.dna.species.mutant_bodyparts -= "tail_lizard"
color = "#" + tail_owner.dna.features["mcolor"]
color = tail_owner.dna.features["mcolor"]
tail_type = tail_owner.dna.features["tail_lizard"]
spines = tail_owner.dna.features["spines"]
tail_owner.update_body()