diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 940ec0f104..e6686f532e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -987,7 +987,6 @@ helmet.name = "engineering voidsuit helmet" helmet.icon_state = "rig0-engineering" helmet.item_state = "eng_helm" - helmet.item_color = "engineering" if(suit) suit.name = "engineering voidsuit" suit.icon_state = "rig-engineering" @@ -997,7 +996,6 @@ helmet.name = "mining voidsuit helmet" helmet.icon_state = "rig0-mining" helmet.item_state = "mining_helm" - helmet.item_color = "mining" if(suit) suit.name = "mining voidsuit" suit.icon_state = "rig-mining" @@ -1007,7 +1005,6 @@ helmet.name = "medical voidsuit helmet" helmet.icon_state = "rig0-medical" helmet.item_state = "medical_helm" - helmet.item_color = "medical" if(suit) suit.name = "medical voidsuit" suit.icon_state = "rig-medical" @@ -1017,7 +1014,6 @@ helmet.name = "security voidsuit helmet" helmet.icon_state = "rig0-sec" helmet.item_state = "sec_helm" - helmet.item_color = "sec" if(suit) suit.name = "security voidsuit" suit.icon_state = "rig-sec" @@ -1027,7 +1023,6 @@ helmet.name = "atmospherics voidsuit helmet" helmet.icon_state = "rig0-atmos" helmet.item_state = "atmos_helm" - helmet.item_color = "atmos" if(suit) suit.name = "atmospherics voidsuit" suit.icon_state = "rig-atmos" @@ -1037,7 +1032,6 @@ helmet.name = "blood-red voidsuit helmet" helmet.icon_state = "rig0-syndie" helmet.item_state = "syndie_helm" - helmet.item_color = "syndie" if(suit) suit.name = "blood-red voidsuit" suit.item_state = "syndie_voidsuit" diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index ad433d12e2..9e1e91935d 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -52,127 +52,6 @@ WL.amount = HH.amount del(HH) - - if(crayon) - var/wash_color - if(istype(crayon,/obj/item/toy/crayon)) - var/obj/item/toy/crayon/CR = crayon - wash_color = CR.colourName - else if(istype(crayon,/obj/item/weapon/stamp)) - var/obj/item/weapon/stamp/ST = crayon - wash_color = ST.item_color - - if(wash_color) - var/new_jumpsuit_icon_state = "" - var/new_jumpsuit_item_state = "" - var/new_jumpsuit_name = "" - var/new_glove_icon_state = "" - var/new_glove_item_state = "" - var/new_glove_name = "" - var/new_shoe_icon_state = "" - var/new_shoe_name = "" - var/new_sheet_icon_state = "" - var/new_sheet_name = "" - var/new_softcap_icon_state = "" - var/new_softcap_name = "" - var/new_desc = "The colors are a bit dodgy." - for(var/T in typesof(/obj/item/clothing/under)) - var/obj/item/clothing/under/J = new T - //world << "DEBUG: [color] == [J.color]" - if(wash_color == J.item_color) - new_jumpsuit_icon_state = J.icon_state - new_jumpsuit_item_state = J.item_state - new_jumpsuit_name = J.name - del(J) - //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]" - break - del(J) - for(var/T in typesof(/obj/item/clothing/gloves)) - var/obj/item/clothing/gloves/G = new T - //world << "DEBUG: [color] == [J.color]" - if(wash_color == G.item_color) - new_glove_icon_state = G.icon_state - new_glove_item_state = G.item_state - new_glove_name = G.name - del(G) - //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]" - break - del(G) - for(var/T in typesof(/obj/item/clothing/shoes)) - var/obj/item/clothing/shoes/S = new T - //world << "DEBUG: [color] == [J.color]" - if(wash_color == S.item_color) - new_shoe_icon_state = S.icon_state - new_shoe_name = S.name - del(S) - //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]" - break - del(S) - for(var/T in typesof(/obj/item/weapon/bedsheet)) - var/obj/item/weapon/bedsheet/B = new T - //world << "DEBUG: [color] == [J.color]" - if(wash_color == B.item_color) - new_sheet_icon_state = B.icon_state - new_sheet_name = B.name - del(B) - //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]" - break - del(B) - for(var/T in typesof(/obj/item/clothing/head/soft)) - var/obj/item/clothing/head/soft/H = new T - //world << "DEBUG: [color] == [J.color]" - if(wash_color == H.item_color) - new_softcap_icon_state = H.icon_state - new_softcap_name = H.name - del(H) - //world << "DEBUG: YUP! [new_icon_state] and [new_item_state]" - break - del(H) - if(new_jumpsuit_icon_state && new_jumpsuit_item_state && new_jumpsuit_name) - for(var/obj/item/clothing/under/J in contents) - //world << "DEBUG: YUP! FOUND IT!" - J.item_state = new_jumpsuit_item_state - J.icon_state = new_jumpsuit_icon_state - J.item_color = wash_color - J.name = new_jumpsuit_name - J.desc = new_desc - if(new_glove_icon_state && new_glove_item_state && new_glove_name) - for(var/obj/item/clothing/gloves/G in contents) - //world << "DEBUG: YUP! FOUND IT!" - G.item_state = new_glove_item_state - G.icon_state = new_glove_icon_state - G.item_color = wash_color - G.name = new_glove_name - G.desc = new_desc - if(new_shoe_icon_state && new_shoe_name) - for(var/obj/item/clothing/shoes/S in contents) - //world << "DEBUG: YUP! FOUND IT!" - if (istype(S,/obj/item/clothing/shoes/orange)) - var/obj/item/clothing/shoes/orange/L = S - if (L.chained) - L.remove_cuffs() - S.icon_state = new_shoe_icon_state - S.item_color = wash_color - S.name = new_shoe_name - S.desc = new_desc - if(new_sheet_icon_state && new_sheet_name) - for(var/obj/item/weapon/bedsheet/B in contents) - //world << "DEBUG: YUP! FOUND IT!" - B.icon_state = new_sheet_icon_state - B.item_color = wash_color - B.name = new_sheet_name - B.desc = new_desc - if(new_softcap_icon_state && new_softcap_name) - for(var/obj/item/clothing/head/soft/H in contents) - //world << "DEBUG: YUP! FOUND IT!" - H.icon_state = new_softcap_icon_state - H.item_color = wash_color - H.name = new_softcap_name - H.desc = new_desc - del(crayon) - crayon = null - - if( locate(/mob,contents) ) state = 7 gibs_ready = 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 87ab21e610..77181a1eb6 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -26,7 +26,6 @@ //Since any item can now be a piece of clothing, this has to be put here so all items share it. var/flags_inv //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc. - var/item_color = null var/body_parts_covered = 0 //see setup.dm for appropriate bit flags //var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 50b4135dd7..d0add791f9 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -9,7 +9,7 @@ var/implanted = null var/mob/imp_in = null var/obj/item/organ/external/part = null - item_color = "b" + var/implant_color = "b" var/allow_reagents = 0 var/malfunction = 0 diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 48aea7a5e1..8d731e0bbe 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -13,7 +13,7 @@ /obj/item/weapon/implantcase/proc/update() if (src.imp) - src.icon_state = text("implantcase-[]", src.imp.item_color) + src.icon_state = text("implantcase-[]", src.imp.implant_color) else src.icon_state = "implantcase-0" return diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index d32ae9d8ba..5131961060 100644 --- a/code/game/objects/items/weapons/implants/implantfreedom.dm +++ b/code/game/objects/items/weapons/implants/implantfreedom.dm @@ -3,7 +3,7 @@ /obj/item/weapon/implant/freedom name = "freedom implant" desc = "Use this to escape from those evil Red Shirts." - item_color = "r" + implant_color = "r" var/activation_emote = "chuckle" var/uses = 1.0 diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index f04be5d33a..631b6895f9 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -113,6 +113,7 @@ origin_tech = "magnets=3;syndicate=4" sharp = 1 edge = 1 + var/blade_color /obj/item/weapon/melee/energy/sword/dropped(var/mob/user) ..() @@ -120,26 +121,26 @@ deactivate(user) /obj/item/weapon/melee/energy/sword/New() - item_color = pick("red","blue","green","purple") + blade_color = pick("red","blue","green","purple") /obj/item/weapon/melee/energy/sword/green/New() - item_color = "green" + blade_color = "green" /obj/item/weapon/melee/energy/sword/red/New() - item_color = "red" + blade_color = "red" /obj/item/weapon/melee/energy/sword/blue/New() - item_color = "blue" + blade_color = "blue" /obj/item/weapon/melee/energy/sword/purple/New() - item_color = "purple" + blade_color = "purple" /obj/item/weapon/melee/energy/sword/activate(mob/living/user) if(!active) user << "\The [src] is now energised." ..() attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - icon_state = "sword[item_color]" + icon_state = "sword[blade_color]" /obj/item/weapon/melee/energy/sword/deactivate(mob/living/user) if(active) diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index d838d41e5b..64f1f9925b 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -15,8 +15,6 @@ LINEN BINS throw_speed = 1 throw_range = 2 w_class = 2.0 - item_color = "white" - /obj/item/weapon/bedsheet/attack_self(mob/user as mob) user.drop_item() @@ -30,67 +28,51 @@ LINEN BINS /obj/item/weapon/bedsheet/blue icon_state = "sheetblue" - item_color = "blue" /obj/item/weapon/bedsheet/green icon_state = "sheetgreen" - item_color = "green" /obj/item/weapon/bedsheet/orange icon_state = "sheetorange" - item_color = "orange" /obj/item/weapon/bedsheet/purple icon_state = "sheetpurple" - item_color = "purple" /obj/item/weapon/bedsheet/rainbow icon_state = "sheetrainbow" - item_color = "rainbow" /obj/item/weapon/bedsheet/red icon_state = "sheetred" - item_color = "red" /obj/item/weapon/bedsheet/yellow icon_state = "sheetyellow" - item_color = "yellow" /obj/item/weapon/bedsheet/mime icon_state = "sheetmime" - item_color = "mime" /obj/item/weapon/bedsheet/clown icon_state = "sheetclown" - item_color = "clown" /obj/item/weapon/bedsheet/captain icon_state = "sheetcaptain" - item_color = "captain" /obj/item/weapon/bedsheet/rd icon_state = "sheetrd" - item_color = "director" /obj/item/weapon/bedsheet/medical icon_state = "sheetmedical" - item_color = "medical" /obj/item/weapon/bedsheet/hos icon_state = "sheethos" - item_color = "hosred" /obj/item/weapon/bedsheet/hop icon_state = "sheethop" - item_color = "hop" /obj/item/weapon/bedsheet/ce icon_state = "sheetce" - item_color = "chief" /obj/item/weapon/bedsheet/brown icon_state = "sheetbrown" - item_color = "brown" /obj/structure/bedsheetbin diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 8f943ccb6c..95c3cab734 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2216,7 +2216,6 @@ for(var/obj/item/clothing/under/W in world) W.icon_state = "schoolgirl" W.item_state = "w_suit" - W.item_color = "schoolgirl" message_admins("[key_name_admin(usr)] activated Japanese Animes mode") world << sound('sound/AI/animes.ogg') if("paintball") diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 55cf4b2ce0..45f8ce8fb3 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -408,6 +408,7 @@ BLIND // can't see anything var/displays_id = 1 var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi') + var/item_color //temporary until item_state override is implemented /obj/item/clothing/under/New() //autodetect rollability diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index 02a34b4192..2ad12aa2bf 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -27,7 +27,3 @@ desc = "These look pretty fancy." icon_state = "latex" item_state = "lgloves" - item_color="mime" - - redcoat - item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way. diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 7b840471e4..f7e7ad4ca7 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -3,7 +3,6 @@ name = "captain's gloves" icon_state = "captain" item_state = "egloves" - item_color = "captain" /obj/item/clothing/gloves/cyborg desc = "beep boop borp" @@ -44,7 +43,6 @@ item_state = "lgloves" siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC) permeability_coefficient = 0.01 - item_color="white" /obj/item/clothing/gloves/botanic_leather desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 436f714053..16a6adda67 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -5,7 +5,6 @@ item_state = "hardhat0_yellow" brightness_on = 4 //luminosity when on light_overlay = "hardhat_light" - item_color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite) armor = list(melee = 30, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20) flags_inv = 0 siemens_coefficient = 0.9 @@ -13,12 +12,10 @@ /obj/item/clothing/head/hardhat/orange icon_state = "hardhat0_orange" item_state = "hardhat0_orange" - item_color = "orange" /obj/item/clothing/head/hardhat/red icon_state = "hardhat0_red" item_state = "hardhat0_red" - item_color = "red" name = "firefighter helmet" flags = STOPPRESSUREDAMAGE heat_protection = HEAD @@ -27,7 +24,6 @@ /obj/item/clothing/head/hardhat/white icon_state = "hardhat0_white" item_state = "hardhat0_white" - item_color = "white" flags = STOPPRESSUREDAMAGE heat_protection = HEAD max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE @@ -35,4 +31,3 @@ /obj/item/clothing/head/hardhat/dblue icon_state = "hardhat0_dblue" item_state = "hardhat0_dblue" - item_color = "dblue" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 5eb7e0c65b..47308280bb 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -122,7 +122,6 @@ desc = "A jack o' lantern! Believed to ward off evil spirits." icon_state = "hardhat0_pumpkin"//Could stand to be renamed item_state = "hardhat0_pumpkin" - item_color = "pumpkin" flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE body_parts_covered = HEAD|EYES diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 1deff69402..d41a4598a4 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -1,16 +1,15 @@ /obj/item/clothing/head/soft name = "cargo cap" - desc = "It's a baseball hat in a tasteless yellow color." + desc = "It's a peaked cap in a tasteless yellow color." icon_state = "cargosoft" flags = HEADCOVERSEYES item_state = "helmet" - item_color = "cargo" var/flipped = 0 siemens_coefficient = 0.9 body_parts_covered = 0 dropped() - src.icon_state = "[item_color]soft" + src.icon_state = initial(icon_state) src.flipped=0 ..() @@ -21,10 +20,10 @@ if(usr.canmove && !usr.stat && !usr.restrained()) src.flipped = !src.flipped if(src.flipped) - icon_state = "[item_color]soft_flipped" + icon_state = "[icon_state]_flipped" usr << "You flip the hat backwards." else - icon_state = "[item_color]soft" + src.icon_state = initial(icon_state) usr << "You flip the hat back in normal position." update_clothing_icon() //so our mob-overlays update @@ -32,64 +31,53 @@ name = "red cap" desc = "It's a baseball hat in a tasteless red color." icon_state = "redsoft" - item_color = "red" /obj/item/clothing/head/soft/blue name = "blue cap" - desc = "It's a baseball hat in a tasteless blue color." + desc = "It's a peaked cap in a tasteless blue color." icon_state = "bluesoft" - item_color = "blue" /obj/item/clothing/head/soft/green name = "green cap" - desc = "It's a baseball hat in a tasteless green color." + desc = "It's a peaked cap in a tasteless green color." icon_state = "greensoft" - item_color = "green" /obj/item/clothing/head/soft/yellow name = "yellow cap" - desc = "It's a baseball hat in a tasteless yellow color." + desc = "It's a peaked cap in a tasteless yellow color." icon_state = "yellowsoft" - item_color = "yellow" /obj/item/clothing/head/soft/grey name = "grey cap" - desc = "It's a baseball hat in a tasteful grey color." + desc = "It's a peaked cap in a tasteful grey color." icon_state = "greysoft" - item_color = "grey" /obj/item/clothing/head/soft/orange name = "orange cap" - desc = "It's a baseball hat in a tasteless orange color." + desc = "It's a peaked cap in a tasteless orange color." icon_state = "orangesoft" - item_color = "orange" /obj/item/clothing/head/soft/mime name = "white cap" - desc = "It's a baseball hat in a tasteless white color." + desc = "It's a peaked cap in a tasteless white color." icon_state = "mimesoft" - item_color = "mime" /obj/item/clothing/head/soft/purple name = "purple cap" - desc = "It's a baseball hat in a tasteless purple color." + desc = "It's a peaked cap in a tasteless purple color." icon_state = "purplesoft" - item_color = "purple" /obj/item/clothing/head/soft/rainbow name = "rainbow cap" - desc = "It's a baseball hat in a bright rainbow of colors." + desc = "It's a peaked cap in a bright rainbow of colors." icon_state = "rainbowsoft" - item_color = "rainbow" /obj/item/clothing/head/soft/sec name = "security cap" - desc = "It's baseball hat in tasteful red color." + desc = "It's a field cap in tasteful red color." icon_state = "secsoft" - item_color = "sec" /obj/item/clothing/head/soft/sec/corp name = "corporate security cap" - desc = "It's baseball hat in corporate colors." + desc = "It's field cap in corporate colors." icon_state = "corpsoft" - item_color = "corp" diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index e20bea4cc7..089f66376f 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -1,7 +1,6 @@ /obj/item/clothing/shoes/black name = "black shoes" icon_state = "black" - item_color = "black" desc = "A pair of black shoes." cold_protection = FEET @@ -9,81 +8,54 @@ heat_protection = FEET max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE - redcoat - item_color = "redcoat" //Exists for washing machines. Is not different from black shoes in any way. - /obj/item/clothing/shoes/brown name = "brown shoes" desc = "A pair of brown shoes." icon_state = "brown" - item_color = "brown" - - captain - item_color = "captain" //Exists for washing machines. Is not different from brown shoes in any way. - hop - item_color = "hop" //Exists for washing machines. Is not different from brown shoes in any way. - ce - item_color = "chief" //Exists for washing machines. Is not different from brown shoes in any way. - rd - item_color = "director" //Exists for washing machines. Is not different from brown shoes in any way. - cmo - item_color = "medical" //Exists for washing machines. Is not different from brown shoes in any way. - cmo - item_color = "cargo" //Exists for washing machines. Is not different from brown shoes in any way. /obj/item/clothing/shoes/blue name = "blue shoes" icon_state = "blue" - item_color = "blue" /obj/item/clothing/shoes/green name = "green shoes" icon_state = "green" - item_color = "green" /obj/item/clothing/shoes/yellow name = "yellow shoes" icon_state = "yellow" - item_color = "yellow" /obj/item/clothing/shoes/purple name = "purple shoes" icon_state = "purple" - item_color = "purple" /obj/item/clothing/shoes/brown name = "brown shoes" icon_state = "brown" - item_color = "brown" /obj/item/clothing/shoes/red name = "red shoes" desc = "Stylish red shoes." icon_state = "red" - item_color = "red" /obj/item/clothing/shoes/white name = "white shoes" icon_state = "white" permeability_coefficient = 0.01 - item_color = "white" /obj/item/clothing/shoes/leather name = "leather shoes" desc = "A sturdy pair of leather shoes." icon_state = "leather" - item_color = "leather" /obj/item/clothing/shoes/rainbow name = "rainbow shoes" desc = "Very gay shoes." icon_state = "rain_bow" - item_color = "rainbow" /obj/item/clothing/shoes/orange name = "orange shoes" icon_state = "orange" - item_color = "orange" var/obj/item/weapon/handcuffs/chained = null /obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/weapon/handcuffs/cuffs, mob/user as mob) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index c30424111b..616d13e858 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -13,7 +13,6 @@ /obj/item/clothing/shoes/mime name = "mime shoes" icon_state = "mime" - item_color = "mime" /obj/item/clothing/shoes/swat name = "\improper SWAT shoes" @@ -68,7 +67,6 @@ icon_state = "clown" item_state = "clown_shoes" slowdown = SHOES_SLOWDOWN+1 - item_color = "clown" force = 0 var/footstep = 1 //used for squeeks whilst walking species_restricted = null @@ -88,7 +86,6 @@ desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." icon_state = "jackboots" item_state = "jackboots" - item_color = "hosred" force = 3 siemens_coefficient = 0.7 @@ -97,7 +94,6 @@ desc = "A pair of boots worn by the followers of Nar-Sie." icon_state = "cult" item_state = "cult" - item_color = "cult" force = 2 siemens_coefficient = 0.7 diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 23ba1d0c55..a50c4bf12f 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -9,12 +9,10 @@ /obj/item/clothing/head/helmet/space/skrell/white icon_state = "skrell_helmet_white" item_state = "skrell_helmet_white" - item_color = "skrell_helmet_white" /obj/item/clothing/head/helmet/space/skrell/black icon_state = "skrell_helmet_black" item_state = "skrell_helmet_black" - item_color = "skrell_helmet_black" /obj/item/clothing/suit/space/skrell name = "Skrellian voidsuit" @@ -28,12 +26,10 @@ /obj/item/clothing/suit/space/skrell/white icon_state = "skrell_suit_white" item_state = "skrell_suit_white" - item_color = "skrell_suit_white" /obj/item/clothing/suit/space/skrell/black icon_state = "skrell_suit_black" item_state = "skrell_suit_black" - item_color = "skrell_suit_black" // Vox space gear (vaccuum suit, low pressure armour) // Can't be equipped by any other species due to bone structure and vox cybernetics. @@ -112,7 +108,6 @@ name = "alien clothing" desc = "This doesn't look very comfortable." icon_state = "vox-casual-1" - item_color = "vox-casual-1" item_state = "vox-casual-1" body_parts_covered = LEGS @@ -120,7 +115,6 @@ name = "alien robes" desc = "Weird and flowing!" icon_state = "vox-casual-2" - item_color = "vox-casual-2" item_state = "vox-casual-2" /obj/item/clothing/gloves/yellow/vox @@ -130,7 +124,6 @@ item_state = "gloves-vox" siemens_coefficient = 0 permeability_coefficient = 0.05 - item_color = "gloves-vox" species_restricted = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/gloves.dmi') /obj/item/clothing/shoes/magboots/vox diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index 907ad044fd..0d2ea51ad2 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -4,7 +4,6 @@ desc = "An advanced helmet designed for work in special operations. Property of Gorlex Marauders." icon_state = "rig0-syndie" item_state = "syndie_helm" - item_color = "syndie" armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.6 species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index f4ef7cb8f8..b7477e2f0e 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -22,7 +22,6 @@ desc = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating." icon_state = "rig0-mining" item_state = "mining_helm" - item_color = "mining" armor = list(melee = 50, bullet = 5, laser = 20,energy = 5, bomb = 55, bio = 100, rad = 20) light_overlay = "helmet_light_dual" @@ -39,7 +38,6 @@ desc = "A special helmet designed for work in a hazardous, low pressure environment. Has minor radiation shielding." icon_state = "rig0-medical" item_state = "medical_helm" - item_color = "medical" armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 50) /obj/item/clothing/suit/space/void/medical @@ -56,7 +54,6 @@ desc = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." icon_state = "rig0-sec" item_state = "sec_helm" - item_color = "sec" armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10) siemens_coefficient = 0.7 light_overlay = "helmet_light_dual" @@ -76,7 +73,6 @@ name = "atmospherics voidsuit helmet" icon_state = "rig0-atmos" item_state = "atmos_helm" - item_color = "atmos" armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 50) max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE light_overlay = "helmet_light_dual" diff --git a/code/modules/clothing/spacesuits/void/wizard.dm b/code/modules/clothing/spacesuits/void/wizard.dm index 56863356f4..2fc0c76dbd 100644 --- a/code/modules/clothing/spacesuits/void/wizard.dm +++ b/code/modules/clothing/spacesuits/void/wizard.dm @@ -4,7 +4,6 @@ desc = "A bizarre gem-encrusted helmet that radiates magical energies." icon_state = "rig0-wiz" item_state = "wiz_helm" - item_color = "wiz" unacidable = 1 //No longer shall our kind be foiled by lone chemists with spray bottles! armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.7 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index bcca81141c..fb9d27f7a5 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -237,21 +237,18 @@ name = "pink swimsuit" desc = "A rather skimpy pink swimsuit." icon_state = "stripper_p_under" - item_color = "stripper_p" siemens_coefficient = 1 /obj/item/clothing/under/stripper/stripper_green name = "green swimsuit" desc = "A rather skimpy green swimsuit." icon_state = "stripper_g_under" - item_color = "stripper_g" siemens_coefficient = 1 /obj/item/clothing/suit/stripper/stripper_pink name = "pink skimpy dress" desc = "A rather skimpy pink dress." icon_state = "stripper_p_over" - item_state = "stripper_p" siemens_coefficient = 1 /obj/item/clothing/suit/stripper/stripper_green @@ -265,7 +262,6 @@ name = "the mankini" desc = "No honest man would wear this abomination" icon_state = "mankini" - item_color = "mankini" siemens_coefficient = 1 /obj/item/clothing/suit/xenos @@ -285,35 +281,30 @@ name = "black swimsuit" desc = "An oldfashioned black swimsuit." icon_state = "swim_black" - item_color = "swim_black" siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/blue name = "blue swimsuit" desc = "An oldfashioned blue swimsuit." icon_state = "swim_blue" - item_color = "swim_blue" siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/purple name = "purple swimsuit" desc = "An oldfashioned purple swimsuit." icon_state = "swim_purp" - item_color = "swim_purp" siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/green name = "green swimsuit" desc = "An oldfashioned green swimsuit." icon_state = "swim_green" - item_color = "swim_green" siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/red name = "red swimsuit" desc = "An oldfashioned red swimsuit." icon_state = "swim_red" - item_color = "swim_red" siemens_coefficient = 1 /obj/item/clothing/suit/poncho diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index f606c84670..8ce02ec8e5 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -4,16 +4,16 @@ icon = 'icons/obj/clothing/ties.dmi' icon_state = "bluetie" item_state = "" //no inhands - item_color = "bluetie" slot_flags = SLOT_TIE w_class = 2.0 var/slot = "decor" var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to var/image/inv_overlay = null //overlay used when attached to clothing. + var/overlay_state = null /obj/item/clothing/accessory/New() ..() - inv_overlay = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[item_color? "[item_color]" : "[icon_state]"]") + inv_overlay = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[overlay_state? "[overlay_state]" : "[icon_state]"]") //when user attached an accessory to S /obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/under/S, mob/user as mob) @@ -47,24 +47,20 @@ /obj/item/clothing/accessory/blue name = "blue tie" icon_state = "bluetie" - item_color = "bluetie" /obj/item/clothing/accessory/red name = "red tie" icon_state = "redtie" - item_color = "redtie" /obj/item/clothing/accessory/horrible name = "horrible tie" desc = "A neosilk clip-on tie. This one is disgusting." icon_state = "horribletie" - item_color = "horribletie" /obj/item/clothing/accessory/stethoscope name = "stethoscope" desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing." icon_state = "stethoscope" - item_color = "stethoscope" /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user) if(ishuman(M) && isliving(user)) @@ -105,7 +101,6 @@ name = "bronze medal" desc = "A bronze medal." icon_state = "bronze" - item_color = "bronze" /obj/item/clothing/accessory/medal/conduct name = "distinguished conduct medal" @@ -124,7 +119,6 @@ name = "silver medal" desc = "A silver medal." icon_state = "silver" - item_color = "silver" /obj/item/clothing/accessory/medal/silver/valor name = "medal of valor" @@ -138,7 +132,6 @@ name = "gold medal" desc = "A prestigious golden medal." icon_state = "gold" - item_color = "gold" /obj/item/clothing/accessory/medal/gold/captain name = "medal of captaincy" @@ -158,7 +151,6 @@ name = "holobadge" desc = "This glowing blue badge marks the holder as THE LAW." icon_state = "holobadge" - item_color = "holobadge" slot_flags = SLOT_BELT | SLOT_TIE var/emagged = 0 //Emagging removes Sec check. @@ -166,7 +158,6 @@ /obj/item/clothing/accessory/holobadge/cord icon_state = "holobadge-cord" - item_color = "holobadge-cord" slot_flags = SLOT_MASK | SLOT_TIE /obj/item/clothing/accessory/holobadge/attack_self(mob/user as mob) diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 67d0208b6d..9aa2ec2b70 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -2,41 +2,34 @@ name = "red armband" desc = "A fancy red armband!" icon_state = "red" - item_color = "red" slot = "armband" /obj/item/clothing/accessory/armband/cargo name = "cargo armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is brown." icon_state = "cargo" - item_color = "cargo" /obj/item/clothing/accessory/armband/engine name = "engineering armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is orange with a reflective strip!" icon_state = "engie" - item_color = "engie" /obj/item/clothing/accessory/armband/science name = "science armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is purple." icon_state = "rnd" - item_color = "rnd" /obj/item/clothing/accessory/armband/hydro name = "hydroponics armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is green and blue." icon_state = "hydro" - item_color = "hydro" /obj/item/clothing/accessory/armband/med name = "medical armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is white." icon_state = "med" - item_color = "med" /obj/item/clothing/accessory/armband/medgreen name = "EMT armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green." icon_state = "medgreen" - item_color = "medgreen" diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index f02ae38a5a..51ce02a7ed 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -2,7 +2,6 @@ name = "shoulder holster" desc = "A handgun holster." icon_state = "holster" - item_color = "holster" slot = "utility" var/obj/item/holstered = null @@ -108,16 +107,14 @@ name = "armpit holster" desc = "A worn-out handgun holster. Perfect for concealed carry" icon_state = "holster" - item_color = "holster" /obj/item/clothing/accessory/holster/waist name = "waist holster" desc = "A handgun holster. Made of expensive leather." icon_state = "holster" - item_color = "holster_low" + overlay_state = "holster_low" /obj/item/clothing/accessory/holster/hip name = "hip holster" desc = "A handgun holster slung low on the hip, draw pardner!" icon_state = "holster_hip" - item_color = "holster_hip" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 6c6c683b27..7f13449d16 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -2,7 +2,6 @@ name = "load bearing equipment" desc = "Used to hold things when you don't have enough hands." icon_state = "webbing" - item_color = "webbing" slot = "utility" var/slots = 3 var/obj/item/weapon/storage/internal/hold @@ -51,27 +50,23 @@ name = "webbing" desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden." icon_state = "webbing" - item_color = "webbing" /obj/item/clothing/accessory/storage/black_vest name = "black webbing vest" desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in hands." icon_state = "vest_black" - item_color = "vest_black" slots = 5 /obj/item/clothing/accessory/storage/brown_vest name = "brown webbing vest" desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands." icon_state = "vest_brown" - item_color = "vest_brown" slots = 5 /obj/item/clothing/accessory/storage/knifeharness name = "decorated harness" desc = "A heavily decorated harness of sinew and leather with two knife-loops." icon_state = "unathiharness2" - item_color = "unathiharness2" slots = 2 /obj/item/clothing/accessory/storage/knifeharness/New() diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index 01bea29b2e..bfef111a3a 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -37,7 +37,7 @@ if(!picked || !clothing_choices[picked]) return var/newtype = clothing_choices[picked] - var/obj/item/clothing/A = new newtype + var/obj/item/clothing/under/A = new newtype desc = null permeability_coefficient = 0.90 @@ -58,7 +58,6 @@ name = "grey cap" icon_state = "greysoft" item_state = "greysoft" - item_color = "grey" desc = "It looks like a plain hat, but upon closer inspection, there's an advanced holographic array installed inside. It seems to have a small dial inside." origin_tech = "syndicate=3" body_parts_covered = 0 @@ -76,7 +75,6 @@ name = "grey cap" desc = "It's a baseball hat in a tasteful grey colour." icon_state = "greysoft" - item_color = "grey" update_icon() update_clothing_icon() @@ -98,7 +96,6 @@ name = A.name icon_state = A.icon_state item_state = A.item_state - item_color = A.item_color flags_inv = A.flags_inv body_parts_covered = A.body_parts_covered update_clothing_icon() //so our overlays update. @@ -128,7 +125,6 @@ name = "armor" desc = "An armored vest that protects against some damage." icon_state = "armor" - item_color = "armor" update_icon() update_clothing_icon() @@ -150,7 +146,6 @@ name = A.name icon_state = A.icon_state item_state = A.item_state - item_color = A.item_color flags_inv = A.flags_inv body_parts_covered = A.body_parts_covered update_clothing_icon() //so our overlays update. @@ -162,7 +157,6 @@ name = "black shoes" icon_state = "black" item_state = "black" - item_color = "black" desc = "They're comfy black shoes, with clever cloaking technology built in. It seems to have a small dial on the back of each shoe." origin_tech = "syndicate=3" var/list/clothing_choices = list() @@ -180,7 +174,6 @@ desc = "A pair of black shoes." icon_state = "black" item_state = "black" - item_color = "black" update_icon() update_clothing_icon() @@ -202,7 +195,6 @@ name = A.name icon_state = A.icon_state item_state = A.item_state - item_color = A.item_color update_clothing_icon() //so our overlays update. //********************** @@ -252,7 +244,6 @@ name = A.name icon_state = A.icon_state item_state = A.item_state - item_color = A.item_color //so our overlays update. if (ismob(src.loc)) @@ -267,7 +258,6 @@ name = "black gloves" icon_state = "black" item_state = "bgloves" - item_color = "brown" desc = "It looks like a pair of gloves, but it seems to have a small dial inside." origin_tech = "syndicate=3" var/list/clothing_choices = list() @@ -284,7 +274,6 @@ name = "black gloves" desc = "It looks like a pair of gloves, but it seems to have a small dial inside." icon_state = "black" - item_color = "brown" update_icon() update_clothing_icon() @@ -306,7 +295,6 @@ name = A.name icon_state = A.icon_state item_state = A.item_state - item_color = A.item_color flags_inv = A.flags_inv update_clothing_icon() //so our overlays update. diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 13d1a59d5e..228e33e575 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -119,7 +119,6 @@ desc = "A medical apparatus intended to ease in listening to the sounds of the human body. This one looks cleaner and sparklier than the rest. There is a small silver plaque attached to the tubing, with the words 'Lucy Kemmerer' engraved on it." icon_state = "lucystethos" item_state = "lucystethos" - item_color ="lucystethos" icon = 'icons/obj/custom_items.dmi' /obj/item/weapon/pen/fluff/multi //spaceman96: Trenna Seber @@ -167,7 +166,6 @@ desc = "A faded badge, backed with leather, that reads 'NT Security Force' across the front. It bears the emblem of the Forensic division." icon_state = "ana_badge" item_state = "ana_badge" - item_color = "ana_badge" /obj/item/fluff/ana_issek_2/attack_self(mob/user as mob) if(isliving(user)) @@ -544,7 +542,6 @@ desc = kit.new_helmet_desc icon_state = kit.helmet_icon item_state = kit.helmet_icon - item_color = kit.helmet_color if(kit.new_light_overlay) light_overlay = kit.new_light_overlay @@ -652,9 +649,8 @@ desc = "Reinforced sterile gloves custom tailored to comfortably accommodate Tajaran claws." icon_state = "latex" item_state = "lgloves" - siemens_coefficient = 0.30 + siemens_coefficient = 1.00 permeability_coefficient = 0.01 - item_color="white" species_restricted = list("exclude","Unathi") /obj/item/clothing/gloves/fluff/walter_brooks_1 //botanistpower: Walter Brooks @@ -663,7 +659,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "walter_brooks_1" item_state = "bluegloves" - item_color="blue" /obj/item/clothing/gloves/fluff/chal_appara_1 //furlucis: Chal Appara name = "Left Black Glove" @@ -886,7 +881,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "leatherjack" item_state = "leatherjack" - item_color = "leatherjack" /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl name = "blue shield security armor" @@ -1130,7 +1124,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "parker_eliza_arms" item_state = "parker_eliza_arms" - item_color = "parker_eliza_arms" ////////////// Accessories ///// @@ -1143,7 +1136,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "radi_pendant" item_state = "radi_pendant" - item_color = "radi_pendant" w_class = 2.0 //////////// Masks //////////// @@ -1195,7 +1187,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "altair_locket" item_state = "altair_locket" - item_color = "altair_locket" slot_flags = 0 w_class = 2 slot_flags = SLOT_MASK | SLOT_TIE @@ -1208,7 +1199,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "konaahirano" item_state = "konaahirano" - item_color = "konaahirano" slot_flags = 0 w_class = 2 slot_flags = SLOT_MASK | SLOT_TIE @@ -1326,7 +1316,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "retpolcoat" item_state = "retpolcoat" - item_color = "retpolcoat" /obj/item/clothing/head/det_hat/fluff/retpolcap name = "retired colony patrolman's cap" diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 7200711b60..4de99e7624 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -203,6 +203,7 @@ w_class = 2.0 flags = NOSHIELD | NOBLOODY var/active = 0 + var/item_color /obj/item/weapon/holo/esword/green New() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index dbc78f513c..4d6f1e2a7d 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -457,7 +457,7 @@ var/global/list/damage_icon_parts = list() /mob/living/carbon/human/update_inv_w_uniform(var/update_icons=1) if(w_uniform && istype(w_uniform, /obj/item/clothing/under) ) w_uniform.screen_loc = ui_iclothing - var/t_color = w_uniform.item_color + var/t_color = w_uniform:item_color if(!t_color) t_color = icon_state var/image/standing = image("icon_state" = "[t_color]_s") @@ -475,9 +475,8 @@ var/global/list/damage_icon_parts = list() if(w_uniform:accessories.len) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. for(var/obj/item/clothing/accessory/A in w_uniform:accessories) - var/tie_color = A.item_color - if(!tie_color) tie_color = A.icon_state - standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]") + var/accessory_state = A.overlay_state? A.overlay_state : A.icon_state + standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[accessory_state]") overlays_standing[UNIFORM_LAYER] = standing else diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index f2767ca0e8..c200ff86cc 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -9,59 +9,48 @@ throw_speed = 7 throw_range = 15 matter = list("metal" = 60) - item_color = "cargo" pressure_resistance = 2 attack_verb = list("stamped") /obj/item/weapon/stamp/captain name = "captain's rubber stamp" icon_state = "stamp-cap" - item_color = "captain" /obj/item/weapon/stamp/hop name = "head of personnel's rubber stamp" icon_state = "stamp-hop" - item_color = "hop" /obj/item/weapon/stamp/hos name = "head of security's rubber stamp" icon_state = "stamp-hos" - item_color = "hosred" /obj/item/weapon/stamp/ce name = "chief engineer's rubber stamp" icon_state = "stamp-ce" - item_color = "chief" /obj/item/weapon/stamp/rd name = "research director's rubber stamp" icon_state = "stamp-rd" - item_color = "director" /obj/item/weapon/stamp/cmo name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" - item_color = "cmo" /obj/item/weapon/stamp/denied name = "\improper DENIED rubber stamp" icon_state = "stamp-deny" - item_color = "redcoat" /obj/item/weapon/stamp/clown name = "clown's rubber stamp" icon_state = "stamp-clown" - item_color = "clown" /obj/item/weapon/stamp/internalaffairs name = "internal affairs rubber stamp" icon_state = "stamp-intaff" - item_color = "intaff" /obj/item/weapon/stamp/centcomm name = "centcomm rubber stamp" icon_state = "stamp-cent" - item_color = "centcomm" // Syndicate stamp to forge documents. /obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob) @@ -85,4 +74,3 @@ if(chosen_stamp) name = chosen_stamp.name icon_state = chosen_stamp.icon_state - item_color = chosen_stamp.item_color \ No newline at end of file diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index f652ebe9ec..072077b816 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -470,7 +470,6 @@ obj/structure/cable/proc/cableColor(var/colorC) amount = MAXCOIL max_amount = MAXCOIL color = COLOR_RED - //item_color = COLOR_RED Use regular "color" var instead. No need to have it duplicate in two vars. Causes confusion. desc = "A coil of power cable." throwforce = 10 w_class = 2.0 diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index c8609074b6..914e22b0fe 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -497,41 +497,32 @@ usr << "\blue You color \the [src] [clr]" icon_state = "egg-[clr]" - item_color = clr else ..() /obj/item/weapon/reagent_containers/food/snacks/egg/blue icon_state = "egg-blue" - item_color = "blue" /obj/item/weapon/reagent_containers/food/snacks/egg/green icon_state = "egg-green" - item_color = "green" /obj/item/weapon/reagent_containers/food/snacks/egg/mime icon_state = "egg-mime" - item_color = "mime" /obj/item/weapon/reagent_containers/food/snacks/egg/orange icon_state = "egg-orange" - item_color = "orange" /obj/item/weapon/reagent_containers/food/snacks/egg/purple icon_state = "egg-purple" - item_color = "purple" /obj/item/weapon/reagent_containers/food/snacks/egg/rainbow icon_state = "egg-rainbow" - item_color = "rainbow" /obj/item/weapon/reagent_containers/food/snacks/egg/red icon_state = "egg-red" - item_color = "red" /obj/item/weapon/reagent_containers/food/snacks/egg/yellow icon_state = "egg-yellow" - item_color = "yellow" /obj/item/weapon/reagent_containers/food/snacks/friedegg name = "Fried egg"