Remove (almost) unused var/item_color from /obj/item (#30453)

* it's black and white

* Update soft_caps.dm

* bruh

* bruh

* tweaks

* comment

* Update abduction_gear.dm

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

---------

Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
kyunkyunkyun
2025-10-06 17:59:46 +00:00
committed by GitHub
co-authored by Mason
parent 3ebacb5459
commit 9b095a559d
83 changed files with 228 additions and 841 deletions
-1
View File
@@ -99,7 +99,6 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
var/dyeing_key
/// If this item is put into a washing machine to be dyed, can objects of this type be dyed into a different color/icon?
var/dyeable = FALSE
var/item_color
/// What bodyflags does this item cover? See setup.dm for appropriate bit flags
var/body_parts_covered = 0
/// For leaking gas from turf to mask and vice-versa.
@@ -10,7 +10,6 @@
icon_state = "generic" //Shows up as a auto surgeon, used as a placeholder when a implant doesn't have a sprite
origin_tech = "materials=2;biotech=3;programming=2"
actions_types = list(/datum/action/item_action/hands_free/activate)
item_color = "black"
flags = DROPDEL // By default, don't let implants be harvestable.
///which implant overlay should be used for implant cases. This should point to a state in bio_chips.dmi
@@ -2,7 +2,6 @@
name = "power bio-chip"
desc = "A shockingly effective bio-chip for stunning or killing all those in your way. Do it."
icon_state = "lighting_bolt"
item_color = "r"
origin_tech = "combat=5;magnets=3;biotech=4;syndicate=2"
implant_data = /datum/implant_fluff/shock
implant_state = "implant-syndicate"
@@ -13,7 +13,6 @@
desc = "Stores up to two big items in a bluespace pocket."
icon_state = "storage"
origin_tech = "materials=2;magnets=4;bluespace=5;syndicate=4"
item_color = "r"
implant_data = /datum/implant_fluff/storage
implant_state = "implant-syndicate"
-1
View File
@@ -2,7 +2,6 @@
name = "pet collar"
desc = "The latest fashion accessory for your favorite pets!"
icon_state = "petcollar"
item_color = "petcollar"
var/tagname = null
var/original_name
var/original_real_name
-1
View File
@@ -30,7 +30,6 @@
worn_icon_state = initial(target_obj.worn_icon_state)
inhand_icon_state = initial(target_obj.inhand_icon_state)
sprite_sheets = target_obj.sprite_sheets
item_color = target_obj.item_color
desc = target_obj.desc
base_icon_state = target_obj.base_icon_state
+17 -15
View File
@@ -171,7 +171,7 @@
name = "toy sword"
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
icon = 'icons/obj/weapons/energy_melee.dmi'
icon_state = "sword0"
icon_state = "sword"
lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
var/active = FALSE
@@ -190,7 +190,7 @@
else
to_chat(user, "<span class='notice'>You push the plastic blade back down into the handle.</span>")
playsound(user, 'sound/weapons/saberoff.ogg', 20, 1)
icon_state = "sword0"
icon_state = "sword"
w_class = WEIGHT_CLASS_SMALL
if(ishuman(user))
@@ -442,15 +442,17 @@
icon_state = "therapyred"
inhand_icon_state = "egg4"
w_class = WEIGHT_CLASS_TINY
var/cooldown = 0
resistance_flags = FLAMMABLE
var/cooldown = 0
/// Color of the doll. Affects appearance, make sure there is appropriate icon_state in icon file
var/doll_color
/obj/item/toy/therapy/New()
..()
if(item_color)
name = "[item_color] therapy doll"
desc += " This one is [item_color]."
icon_state = "therapy[item_color]"
/obj/item/toy/therapy/Initialize(mapload)
. = ..()
if(doll_color)
name = "[doll_color] therapy doll"
desc += " This one is [doll_color]."
icon_state = "therapy[doll_color]"
/obj/item/toy/therapy/activate_self(mob/user)
if(..() || !(cooldown < world.time - 8))
@@ -460,26 +462,26 @@
cooldown = world.time
/obj/item/toy/therapy/red
item_color = "red"
doll_color = "red"
/obj/item/toy/therapy/purple
inhand_icon_state = "egg1" // It's the magenta egg in items_left/righthand
item_color = "purple"
doll_color = "purple"
/obj/item/toy/therapy/blue
inhand_icon_state = "egg2" // It's the blue egg in items_left/righthand
item_color = "blue"
doll_color = "blue"
/obj/item/toy/therapy/yellow
inhand_icon_state = "egg5" // It's the yellow egg in items_left/righthand
item_color = "yellow"
doll_color = "yellow"
/obj/item/toy/therapy/orange
item_color = "orange"
doll_color = "orange"
/obj/item/toy/therapy/green
inhand_icon_state = "egg3" // It's the green egg in items_left/righthand
item_color = "green"
doll_color = "green"
/*
* Fake meteor
@@ -2,7 +2,6 @@
name = "freedom bio-chip"
desc = "Use this to escape from those evil Red Shirts."
icon_state = "freedom"
item_color = "r"
origin_tech = "combat=5;magnets=3;biotech=4;syndicate=2"
uses = 4
implant_data = /datum/implant_fluff/freedom
@@ -41,7 +41,16 @@
resistance_flags = FIRE_PROOF
light_power = 2
var/brightness_on = 2
var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
/// Blade color to adjust icon_state/inhand_icon_state
var/blade_color
/// Translates blade_color into RGB color for lighting system
var/colormap = list(
"red" = LIGHT_COLOR_RED,
"blue" = LIGHT_COLOR_LIGHTBLUE,
"green" = LIGHT_COLOR_GREEN,
"purple" = LIGHT_COLOR_PURPLE,
"rainbow" = LIGHT_COLOR_WHITE
)
/// Used to mark the item as a cleaving saw so that cigarette_lighter_act() will perform an early return.
var/is_a_cleaving_saw = FALSE
@@ -134,10 +143,10 @@
attack_verb = attack_verb_on
if(icon_state_on)
icon_state = icon_state_on
set_light(brightness_on, l_color = item_color ? colormap[item_color] : null)
set_light(brightness_on, l_color = colormap[blade_color])
else
icon_state = "sword[item_color]"
set_light(brightness_on, l_color=colormap[item_color])
icon_state = "sword[blade_color]"
set_light(brightness_on, l_color = colormap[blade_color])
w_class = w_class_on
playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
to_chat(user, "<span class='notice'>[src] is now active.</span>")
@@ -199,7 +208,7 @@
/obj/item/melee/energy/sword
name = "energy sword"
desc = "May the force be within you."
icon_state = "sword0"
icon_state = "sword"
force = 3
throwforce = 5
throw_speed = 3
@@ -213,10 +222,10 @@
sharp = TRUE
var/hacked = FALSE
/obj/item/melee/energy/sword/New()
..()
if(item_color == null)
item_color = pick("red", "blue", "green", "purple")
/obj/item/melee/energy/sword/Initialize(mapload)
. = ..()
if(!blade_color)
blade_color = pick("red", "blue", "green", "purple")
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES, _requires_activation = TRUE)
/obj/item/melee/energy/sword/examine(mob/user)
@@ -242,10 +251,6 @@
..()
return
/obj/item/melee/energy/sword/cyborg/saw/New()
..()
item_color = null
/obj/item/melee/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
return FALSE
@@ -253,16 +258,16 @@
/obj/item/melee/energy/sword/saber
/obj/item/melee/energy/sword/saber/blue
item_color = "blue"
blade_color = "blue"
/obj/item/melee/energy/sword/saber/purple
item_color = "purple"
blade_color = "purple"
/obj/item/melee/energy/sword/saber/green
item_color = "green"
blade_color = "green"
/obj/item/melee/energy/sword/saber/red
item_color = "red"
blade_color = "red"
/obj/item/melee/energy/sword/saber/attackby__legacy__attackchain(obj/item/W, mob/living/user, params)
..()
@@ -276,14 +281,14 @@
var/obj/item/dualsaber/newSaber = new /obj/item/dualsaber(user.loc)
if(src.hacked) // That's right, we'll only check the "original" esword.
newSaber.hacked = TRUE
newSaber.item_color = "rainbow"
newSaber.blade_color = "rainbow"
qdel(W)
qdel(src)
user.put_in_hands(newSaber)
else if(istype(W, /obj/item/multitool))
if(!hacked)
hacked = TRUE
item_color = "rainbow"
blade_color = "rainbow"
to_chat(user, "<span class='warning'>RNBW_ENGAGE</span>")
if(HAS_TRAIT(src, TRAIT_ITEM_ACTIVE))
@@ -330,10 +335,10 @@
icon_state = "esaw_0"
icon_state_on = "esaw_1"
hitcost = 75 //Costs more than a standard cyborg esword
item_color = null
w_class = WEIGHT_CLASS_NORMAL
light_color = LIGHT_COLOR_WHITE
tool_behaviour = TOOL_SAW
blade_color = "red"
//////////////////////////////
// MARK: CUTLASS
@@ -351,7 +356,7 @@
icon_state_on = "cutlass1"
light_color = LIGHT_COLOR_RED
origin_tech = "combat=3;magnets=4"
item_color = "red"
blade_color = "red"
//////////////////////////////
// MARK: HARDLIGHT BLADE
@@ -458,10 +463,10 @@
attack_verb = attack_verb_on
if(icon_state_on)
icon_state = icon_state_on
set_light(brightness_on, l_color = item_color ? colormap[item_color] : null)
set_light(brightness_on, l_color = colormap[blade_color])
else
icon_state = "sword[item_color]"
set_light(brightness_on, l_color=colormap[item_color])
icon_state = "sword[blade_color]"
set_light(brightness_on, l_color = colormap[blade_color])
w_class = w_class_on
playsound(user, 'sound/magic/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (HAS_TRAIT(src, TRAIT_ITEM_ACTIVE) * 30000))
to_chat(user, "<span class='notice'>You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.</span>")
@@ -691,7 +691,6 @@
icon_state = "pyro"
inhand_icon_state = null
worn_icon_state = null
item_color = "pyro" // I will kill washing machines one day
can_be_cut = FALSE
actions_types = list(/datum/action/item_action/toggle)
dyeable = FALSE
@@ -16,7 +16,6 @@ LINEN BINS
throw_speed = 1
throw_range = 2
w_class = WEIGHT_CLASS_TINY
item_color = "white"
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_NECK
dog_fashion = /datum/dog_fashion/head/ghost
@@ -60,25 +59,21 @@ LINEN BINS
/obj/item/bedsheet/blue
icon_state = "sheetblue"
item_color = "blue"
dream_messages = list("blue")
nightmare_messages = list("vox blood")
/obj/item/bedsheet/green
icon_state = "sheetgreen"
item_color = "green"
dream_messages = list("green")
nightmare_messages = list("unathi flesh")
/obj/item/bedsheet/orange
icon_state = "sheetorange"
item_color = "orange"
dream_messages = list("orange")
nightmare_messages = list("exploding fruit")
/obj/item/bedsheet/purple
icon_state = "sheetpurple"
item_color = "purple"
dream_messages = list("purple")
nightmare_messages = list("Grey blood")
@@ -86,7 +81,6 @@ LINEN BINS
name = "patriotic bedsheet"
desc = "You've never felt more free than when sleeping on this."
icon_state = "sheetUSA"
item_color = "sheetUSA"
dream_messages = list("America", "freedom", "fireworks", "bald eagles")
nightmare_messages = list("communism")
@@ -94,25 +88,21 @@ LINEN BINS
name = "rainbow bedsheet"
desc = "A multi_colored blanket. It's actually several different sheets cut up and sewn together."
icon_state = "sheetrainbow"
item_color = "rainbow"
dream_messages = list("red", "orange", "yellow", "green", "blue", "purple", "a rainbow")
nightmare_messages = list("green", "a cluwne", "fLoOr ClUwNe")
/obj/item/bedsheet/red
icon_state = "sheetred"
item_color = "red"
dream_messages = list("red")
nightmare_messages = list("gibs")
/obj/item/bedsheet/yellow
icon_state = "sheetyellow"
item_color = "yellow"
dream_messages = list("yellow")
nightmare_messages = list("locker full of banana peels")
/obj/item/bedsheet/black
icon_state = "sheetblack"
item_color = "black"
dream_messages = list("black")
nightmare_messages = list("the void of space")
@@ -120,7 +110,6 @@ LINEN BINS
name = "mime's blanket"
desc = "A very soothing striped blanket. All the noise just seems to fade out when you're under the covers in this."
icon_state = "sheetmime"
item_color = "mime"
dream_messages = list("silence", "gestures", "a pale face", "a gaping mouth", "the mime")
nightmare_messages = list("honk", "laughter", "a prank", "a joke", "a smiling face", "the clown")
@@ -128,7 +117,6 @@ LINEN BINS
name = "clown's blanket"
desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas."
icon_state = "sheetclown"
item_color = "clown"
dream_messages = list("honk", "laughter", "a prank", "a joke", "a smiling face", "the clown")
nightmare_messages = list("silence", "gestures", "a pale face", "a gaping mouth", "the mime")
@@ -136,7 +124,6 @@ LINEN BINS
name = "captain's bedsheet."
desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
icon_state = "sheetcaptain"
item_color = "captain"
dream_messages = list("authority", "a golden ID", "sunglasses", "a green disc", "an antique gun", "the captain")
nightmare_messages = list("comdom", "clown with all access", "the syndicate")
@@ -144,7 +131,6 @@ LINEN BINS
name = "research director's bedsheet"
desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
icon_state = "sheetrd"
item_color = "director"
dream_messages = list("authority", "a silvery ID", "a bomb", "a mech", "a facehugger", "maniacal laughter", "the research director")
nightmare_messages = list("toxins full of plasma", "UPGRADE THE SLEEPERS", "rogue ai")
@@ -157,7 +143,6 @@ LINEN BINS
name = "medical blanket"
desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station."
icon_state = "sheetmedical"
item_color = "medical"
dream_messages = list("healing", "life", "surgery", "a doctor")
nightmare_messages = list("death", "no cryox", "cryo is off")
@@ -165,7 +150,6 @@ LINEN BINS
name = "chief medical officer's bedsheet"
desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime."
icon_state = "sheetcmo"
item_color = "cmo"
dream_messages = list("authority", "a silvery ID", "healing", "life", "surgery", "a cat", "the chief medical officer")
nightmare_messages = list("chemists making meth", "cryo it off", "where is the defib", "no biomass")
@@ -173,7 +157,6 @@ LINEN BINS
name = "head of security's bedsheet"
desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!"
icon_state = "sheethos"
item_color = "hosred"
dream_messages = list("authority", "a silvery ID", "handcuffs", "a baton", "a flashbang", "sunglasses", "the head of security")
nightmare_messages = list("the clown", "a toolbox", "sHiTcUrItY", "why did you put them in for 50 minutes")
@@ -181,7 +164,6 @@ LINEN BINS
name = "head of personnel's bedsheet"
desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
icon_state = "sheethop"
item_color = "hop"
dream_messages = list("authority", "a silvery ID", "obligation", "a computer", "an ID", "a corgi", "the head of personnel")
nightmare_messages = list("improper paperwork", "all access clown", "50 open clown slots", "dead ian")
@@ -189,7 +171,6 @@ LINEN BINS
name = "chief engineer's bedsheet"
desc = "It is decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
icon_state = "sheetce"
item_color = "chief"
dream_messages = list("authority", "a silvery ID", "the engine", "power tools", "an APC", "a parrot", "the chief engineer")
nightmare_messages = list("forced airlock", "syndicate bomb", "explosion in research chem", "iT's LoOsE")
@@ -197,13 +178,11 @@ LINEN BINS
name = "quartermaster's bedsheet"
desc = "It is decorated with a crate emblem in silver lining. It's rather tough, and just the thing to lie on after a hard day of pushing paper."
icon_state = "sheetqm"
item_color = "qm"
dream_messages = list("a grey ID", "a shuttle", "a crate", "a sloth", "the quartermaster")
nightmare_messages = list("a bald person", "no points", "wheres the ore", "space carp")
/obj/item/bedsheet/brown
icon_state = "sheetbrown"
item_color = "cargo"
dream_messages = list("brown")
nightmare_messages = list("dead monkey")
@@ -211,7 +190,6 @@ LINEN BINS
name = "centcom bedsheet"
desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
icon_state = "sheetcentcom"
item_color = "centcom"
dream_messages = list("a unique ID", "authority", "artillery", "an ending")
nightmare_messages = list("a butt fax")
@@ -219,7 +197,6 @@ LINEN BINS
name = "syndicate bedsheet"
desc = "It has a syndicate emblem and it has an aura of evil."
icon_state = "sheetsyndie"
item_color = "syndie"
dream_messages = list("a green disc", "a red crystal", "a glowing blade", "a wire-covered ID")
nightmare_messages = list("stunbaton", "taser", "lasers", "a toolbox")
@@ -227,7 +204,6 @@ LINEN BINS
name = "cultist's bedsheet"
desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence."
icon_state = "sheetcult"
item_color = "cult"
dream_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure")
nightmare_messages = list("a tome", "a floating red crystal", "a glowing sword", "a bloody symbol", "a massive humanoid figure")
@@ -235,7 +211,6 @@ LINEN BINS
name = "Ratvarian bedsheet"
desc = "You might dream of Ratvar if you sleep with this. The fabric has threads of brass sewn into it which eminate a pleasent warmth."
icon_state = "sheetclockwork"
item_color = "brass"
dream_messages = list("tick, tock, tick, tock, tick, tock, tick, tock", "a great shining city of brass", "men in radiant suits of brass", "a perfect blueprint of the world", "a glowing cogwheel", "a massive humanoid figure")
nightmare_messages = list("<span_class = userdanger>\"the Nar'Sian dogs shall be CRUSHED!\"</span>", "the unenlightened, ready to hear His word", "a half-buried brass titan", "two massive humanoid figures attacking each other")
@@ -243,7 +218,6 @@ LINEN BINS
name = "wizard's bedsheet"
desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!"
icon_state = "sheetwiz"
item_color = "wiz"
dream_messages = list("a book", "an explosion", "lightning", "a staff", "a skeleton", "a robe", "magic")
nightmare_messages = list("a toolbox", "solars")