cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Color variables for scarves/beanie fix (#19438)

Browse Source 
* Does some stuff

* Fixes ties on humans and corgis not applying color and alpha to the overlays

* Renames /datum/dog_fashion vars to reduce confusion
Also fixes issue introduced in d2fd3f36918b9abfa833b75fda8af3c124c85336 where custom DF icon_states (now obj_icon_state) would not carry over to the corgi

* Fixes consistency mess up with dog_fashion
caused by 2595ce2d322cd74653eca2be43f79ad63104e61a
This commit is contained in:
NikNakFlak
2016-07-25 10:23:34 +02:00
committed by AnturK
parent de3572d004
commit 1f6d41bc28
9 changed files with 76 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+4 -1
View File
@@ -387,7 +387,10 @@ BLIND // can't see anything
var/tie_color = hastie.item_color
if(!tie_color)
tie_color = hastie.icon_state
. += image("icon"='icons/mob/ties.dmi', "icon_state"="[tie_color]")
var/image/tI = image("icon"='icons/mob/ties.dmi', "icon_state"="[tie_color]")
tI.alpha = hastie.alpha
tI.color = hastie.color
. += tI
/obj/item/clothing/under/New()
code/modules/clothing/head/beanie.dm
+4 -12
View File
@@ -5,55 +5,47 @@
name = "white beanie"
desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
icon_state = "beanie" //Default white
item_color = "white"
item_color = "beanie"
/obj/item/clothing/head/beanie/black
name = "black beanie"
icon_state = "white"
icon_state = "beanie"
color = "#4A4A4B" //Grey but it looks black
item_color = "black"
/obj/item/clothing/head/beanie/red
name = "red beanie"
icon_state = "beanie"
color = "#D91414" //Red
item_color = "red"
/obj/item/clothing/head/beanie/green
name = "green beanie"
icon_state = "beanie"
color = "#5C9E54" //Green
item_color = "green"
/obj/item/clothing/head/beanie/blue
name = "blue beanie"
/obj/item/clothing/head/beanie/darkblue
name = "dark blue beanie"
icon_state = "beanie"
color = "#1E85BC" //Blue
item_color = "blue"
/obj/item/clothing/head/beanie/purple
name = "purple beanie"
icon_state = "beanie"
color = "#9557C5" //purple
item_color = "purple"
/obj/item/clothing/head/beanie/yellow
name = "yellow beanie"
icon_state = "beanie"
color = "#E0C14F" //Yellow
item_color = "yellow"
/obj/item/clothing/head/beanie/orange
name = "orange beanie"
icon_state = "beanie"
color = "#C67A4B" //orange
item_color = "orange"
/obj/item/clothing/head/beanie/cyan
name = "cyan beanie"
icon_state = "beanie"
color = "#54A3CE" //Cyan (Or close to it)
item_color = "cyan"
//Striped Beanies have unique sprites
code/modules/clothing/under/ties.dm
+45 -45
View File
@@ -214,55 +214,55 @@
//SCARVES//
///////////
/obj/item/clothing/tie/scarf
name = "scarf"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
dog_fashion = /datum/dog_fashion/head
/obj/item/clothing/tie/scarf/red
name = "red scarf"
icon_state = "redscarf"
item_color = "redscarf"
/obj/item/clothing/tie/scarf/green
name = "green scarf"
icon_state = "greenscarf"
item_color = "greenscarf"
/obj/item/clothing/tie/scarf/darkblue
name = "dark blue scarf"
icon_state = "darkbluescarf"
item_color = "darkbluescarf"
/obj/item/clothing/tie/scarf/purple
name = "purple scarf"
icon_state = "purplescarf"
item_color = "purplescarf"
/obj/item/clothing/tie/scarf/yellow
name = "yellow scarf"
icon_state = "yellowscarf"
item_color = "yellowscarf"
/obj/item/clothing/tie/scarf/orange
name = "orange scarf"
icon_state = "orangescarf"
item_color = "orangescarf"
/obj/item/clothing/tie/scarf/lightblue
name = "light blue scarf"
icon_state = "lightbluescarf"
item_color = "lightbluescarf"
/obj/item/clothing/tie/scarf/white
/obj/item/clothing/tie/scarf //Default white color, same functionality as beanies.
name = "white scarf"
icon_state = "whitescarf"
item_color = "whitescarf"
icon_state = "scarf"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
item_color = "scarf"
dog_fashion = /datum/dog_fashion/head
/obj/item/clothing/tie/scarf/black
name = "black scarf"
icon_state = "blackscarf"
item_color = "blackscarf"
icon_state = "scarf"
color = "#4A4A4B" //Grey but it looks black
/obj/item/clothing/tie/scarf/red
name = "red scarf"
icon_state = "scarf"
color = "#D91414" //Red
/obj/item/clothing/tie/scarf/green
name = "green scarf"
icon_state = "scarf"
color = "#5C9E54" //Green
/obj/item/clothing/tie/scarf/darkblue
name = "dark blue scarf"
icon_state = "scarf"
color = "#1E85BC" //Blue
/obj/item/clothing/tie/scarf/purple
name = "purple scarf"
icon_state = "scarf"
color = "#9557C5" //purple
/obj/item/clothing/tie/scarf/yellow
name = "yellow scarf"
icon_state = "scarf"
color = "#E0C14F" //Yellow
/obj/item/clothing/tie/scarf/orange
name = "orange scarf"
icon_state = "scarf"
color = "#C67A4B" //orange
/obj/item/clothing/tie/scarf/cyan
name = "cyan scarf"
icon_state = "scarf"
color = "#54A3CE" //Cyan
//Striped scarves get their own icons
/obj/item/clothing/tie/scarf/zebra
name = "zebra scarf"
code/modules/mob/living/simple_animal/friendly/dog.dm
+12 -4
View File
@@ -400,8 +400,12 @@
var/image/head_icon
var/datum/dog_fashion.DF = new inventory_head.dog_fashion(src)
if(!DF.icon_state)
DF.icon_state = inventory_head.icon_state
if(!DF.obj_icon_state)
DF.obj_icon_state = inventory_head.icon_state
if(!DF.obj_alpha)
DF.obj_alpha = inventory_head.alpha
if(!DF.obj_color)
DF.obj_color = inventory_head.color
if(health <= 0)
head_icon = DF.get_image(dir = EAST)
@@ -416,8 +420,12 @@
var/image/back_icon
var/datum/dog_fashion.DF = new inventory_back.dog_fashion(src)
if(!DF.icon_state)
DF.icon_state = inventory_back.icon_state
if(!DF.obj_icon_state)
DF.obj_icon_state = inventory_back.icon_state
if(!DF.obj_alpha)
DF.obj_alpha = inventory_back.alpha
if(!DF.obj_color)
DF.obj_color = inventory_back.color
if(health <= 0)
back_icon = DF.get_image(dir = EAST)