cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 16:14:08 +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/reagents/chemistry/reagents/alcohol_reagents.dm
+2 -2
View File
@@ -2383,8 +2383,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(DT_PROB(10, delta_time) && istype(metabolizer))
metabolizer.age += 1
if(metabolizer.age > 70)
metabolizer.facial_hair_color = "ccc"
metabolizer.hair_color = "ccc"
metabolizer.facial_hair_color = "#cccccc"
metabolizer.hair_color = "#cccccc"
metabolizer.update_hair()
if(metabolizer.age > 100)
metabolizer.become_nearsighted(type)
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+4 -4
View File
@@ -1075,8 +1075,8 @@
return
var/mob/living/carbon/human/exposed_human = exposed_mob
exposed_human.hair_color = "C2F"
exposed_human.facial_hair_color = "C2F"
exposed_human.hair_color = "#CC22FF"
exposed_human.facial_hair_color = "#CC22FF"
exposed_human.update_hair()
// SKYRAT EDIT ADDITION BEGIN
exposed_human.update_mutant_bodyparts(force_update=TRUE)
@@ -1446,8 +1446,8 @@
. = ..()
if(!(methods & (TOUCH|VAPOR)) || !ishuman(exposed_human) || (reac_volume < 0.5))
return
exposed_human.hair_color = "92f"
exposed_human.facial_hair_color = "92f"
exposed_human.hair_color = "#9922ff"
exposed_human.facial_hair_color = "#9922ff"
exposed_human.update_hair()
/datum/reagent/medicine/polypyr/overdose_process(mob/living/M, delta_time, times_fired)
code/modules/reagents/chemistry/reagents/other_reagents.dm
+3 -3
View File
@@ -494,8 +494,8 @@
if(!HAS_TRAIT(N, TRAIT_BALD))
N.hairstyle = "Spiky"
N.facial_hairstyle = "Shaved"
N.facial_hair_color = "000"
N.hair_color = "000"
N.facial_hair_color = "#000000"
N.hair_color = "#000000"
if(!(HAIR in N.dna.species.species_traits)) //No hair? No problem!
N.dna.species.species_traits += HAIR
if(N.dna.species.use_skintones)
@@ -2098,7 +2098,7 @@
name = "Quantum Hair Dye"
description = "Has a high chance of making you look like a mad scientist."
reagent_state = LIQUID
var/list/potential_colors = list("0ad","a0f","f73","d14","d14","0b5","0ad","f73","fc2","084","05e","d22","fa0") // fucking hair code
var/list/potential_colors = list("#00aadd","#aa00ff","#ff7733","#dd1144","#dd1144","#00bb55","#00aadd","#ff7733","#ffcc22","#008844","#0055ee","#dd2222","#ffaa00") // fucking hair code
color = "#C8A5DC"
taste_description = "sourness"
penetrates_skin = NONE