diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 3e10d6715a3..de9a36c446c 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -144,7 +144,7 @@ . = TRUE /obj/item/toy/crayon/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = hands_state) - // god bless tgui and all of its arguments + // tgui is a plague upon this codebase SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) @@ -466,6 +466,11 @@ item_color = "purple" reagent_contents = list("nutriment" = 1, "purplecrayonpowder" = 1) +/obj/item/toy/crayon/black + icon_state = "crayonblack" + paint_color = "#1C1C1C" //Not completely black because total black looks bad. So Mostly Black. + item_color = "black" + /obj/item/toy/crayon/white icon_state = "crayonwhite" paint_color = "#FFFFFF" @@ -502,7 +507,7 @@ icon = 'icons/obj/crayons.dmi' icon_state = "crayonbox" w_class = 2 - storage_slots = 6 + storage_slots = 7 can_hold = list( /obj/item/toy/crayon ) @@ -515,6 +520,7 @@ new /obj/item/toy/crayon/green(src) new /obj/item/toy/crayon/blue(src) new /obj/item/toy/crayon/purple(src) + new /obj/item/toy/crayon/black(src) update_icon() /obj/item/weapon/storage/crayons/update_icon() diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 8a61348e70a..e70b3ef14b0 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -26,8 +26,8 @@ desc = "These gloves are fire-resistant." name = "black gloves" icon_state = "black" - item_state = "bgloves" - item_color="brown" + item_state = "blackgloves" + item_color="black" cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS @@ -36,10 +36,10 @@ var/can_be_cut = 1 /obj/item/clothing/gloves/color/black/hos - item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. + item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way. /obj/item/clothing/gloves/color/black/ce - item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way. + item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way. /obj/item/clothing/gloves/color/black/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/wirecutters)) @@ -64,6 +64,7 @@ item_state = "redgloves" item_color = "red" + /obj/item/clothing/gloves/color/red/insulated name = "insulated gloves" desc = "These gloves will protect the wearer from electric shock." diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 6cf66684ab9..007138caadb 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -27,7 +27,7 @@ name = "combat gloves" desc = "These tactical gloves are fireproof and shock resistant." icon_state = "black" - item_state = "bgloves" + item_state = "blackgloves" siemens_coefficient = 0 permeability_coefficient = 0.05 strip_delay = 80 diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi index c4eebb65c80..dd686329a14 100644 Binary files a/icons/obj/crayons.dmi and b/icons/obj/crayons.dmi differ