diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 2e08e1a4bac..91c44868a93 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -63,7 +63,6 @@ CONTENTS: desc = "A highly breathable, alien uniform designed for optimal abduction and dissection." icon_state = "abductor" inhand_icon_state = "bl_suit" - item_color = "abductor" has_sensor = FALSE sprite_sheets = list( diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 7548b8875a5..b0d40b588da 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -354,7 +354,7 @@ icon = 'icons/obj/weapons/energy_melee.dmi' lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' - icon_state = "sword0" + icon_state = "sword" hitsound = "swing_hit" force = 3.0 throw_speed = 1 @@ -362,40 +362,39 @@ w_class = WEIGHT_CLASS_SMALL armor_penetration_percentage = 50 var/active = FALSE + /// Color of this e-sword. You can see supported colors in icon file + var/sword_color /obj/item/holo/esword/Initialize(mapload) . = ..() + if(!sword_color) + sword_color = pick("red", "blue", "green", "purple") AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS) -/obj/item/holo/esword/green/New() - ..() - item_color = "green" +/obj/item/holo/esword/update_icon_state() + icon_state = "[initial(icon_state)][active ? sword_color : ""]" -/obj/item/holo/esword/red/New() - ..() - item_color = "red" +/obj/item/holo/esword/green + sword_color = "green" + +/obj/item/holo/esword/red + sword_color = "red" /obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(active) return ..() return 0 -/obj/item/holo/esword/New() - ..() - item_color = pick("red","blue","green","purple") - /obj/item/holo/esword/attack_self__legacy__attackchain(mob/living/user as mob) active = !active if(active) force = 30 - icon_state = "sword[item_color]" hitsound = "sound/weapons/blade1.ogg" w_class = WEIGHT_CLASS_BULKY playsound(user, 'sound/weapons/saberon.ogg', 20, 1) to_chat(user, "[src] is now active.") else force = 3 - icon_state = "sword0" hitsound = "swing_hit" w_class = WEIGHT_CLASS_SMALL playsound(user, 'sound/weapons/saberoff.ogg', 20, 1) @@ -405,7 +404,7 @@ H.update_inv_l_hand() H.update_inv_r_hand() add_fingerprint(user) - return + update_icon(UPDATE_ICON_STATE) /obj/machinery/readybutton name = "Ready Declaration Device" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 68a25248525..7e491d073eb 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -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. diff --git a/code/game/objects/items/bio_chips/bio_chip.dm b/code/game/objects/items/bio_chips/bio_chip.dm index 6fd3880d883..5c2bed0c3fd 100644 --- a/code/game/objects/items/bio_chips/bio_chip.dm +++ b/code/game/objects/items/bio_chips/bio_chip.dm @@ -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 diff --git a/code/game/objects/items/bio_chips/bio_chip_shock.dm b/code/game/objects/items/bio_chips/bio_chip_shock.dm index ff1be3e1419..39753f62df0 100644 --- a/code/game/objects/items/bio_chips/bio_chip_shock.dm +++ b/code/game/objects/items/bio_chips/bio_chip_shock.dm @@ -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" diff --git a/code/game/objects/items/bio_chips/bio_chip_storage.dm b/code/game/objects/items/bio_chips/bio_chip_storage.dm index c4534bd882d..85d12c4e2a4 100644 --- a/code/game/objects/items/bio_chips/bio_chip_storage.dm +++ b/code/game/objects/items/bio_chips/bio_chip_storage.dm @@ -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" diff --git a/code/game/objects/items/collar.dm b/code/game/objects/items/collar.dm index 6eb50053982..9f001d20574 100644 --- a/code/game/objects/items/collar.dm +++ b/code/game/objects/items/collar.dm @@ -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 diff --git a/code/game/objects/items/dyeing.dm b/code/game/objects/items/dyeing.dm index fb05191e0ab..8fafa9fcbb9 100644 --- a/code/game/objects/items/dyeing.dm +++ b/code/game/objects/items/dyeing.dm @@ -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 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index da8a5820772..485f0ebb487 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -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, "You push the plastic blade back down into the handle.") 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 diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm index 219683b20e4..72a94c9d599 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm @@ -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 diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm index b649e39f319..e4404d7810e 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -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, "[src] is now active.") @@ -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, "RNBW_ENGAGE") 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, "You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.") diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 0737eb15e6c..62717fe25ea 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -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 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 98909ada9fe..888c4812e0e 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -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("\"the Nar'Sian dogs shall be CRUSHED!\"", "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") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ffed5945eb2..bbd764f509a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -3268,7 +3268,6 @@ W.sprite_sheets = /obj/item/clothing/under/dress/schoolgirl::sprite_sheets W.worn_icon_state = /obj/item/clothing/under/dress/schoolgirl::worn_icon_state W.inhand_icon_state = /obj/item/clothing/under/dress/schoolgirl::inhand_icon_state - W.item_color = /obj/item/clothing/under/dress/schoolgirl::item_color message_admins("[key_name_admin(usr)] activated Japanese Animes mode") SEND_SOUND(world, sound('sound/AI/animes.ogg')) if("eagles")//SCRAW diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index ea02dc80495..a62a23e0938 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -169,7 +169,7 @@ desc = "Early prototype RIG hardsuit helmet, designed to quickly shift over a user's head. Design constraints of the helmet mean it has no inbuilt cameras, thus it restricts the users visability." icon_state = "hardsuit0-ancient" armor = list(MELEE = 30, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 50, RAD = INFINITY, FIRE = INFINITY, ACID = 75) - item_color = "ancient" + base_icon_state = "ancient" resistance_flags = FIRE_PROOF flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = null diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index b5b78cc3220..3c428704268 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1152,7 +1152,7 @@ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "smithing"), ICON_OVERLAY) has_gloves = TRUE if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "smithsoft"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "smith"), ICON_OVERLAY) switch(backbag) if(2) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) @@ -1376,7 +1376,7 @@ clothes_s = new /icon('icons/mob/clothing/under/medical.dmi', "paramedic_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cig_off"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "paramedicsoft"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "paramedic"), ICON_OVERLAY) switch(backbag) if(2) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 73e091c02a2..90290c4c767 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -191,7 +191,6 @@ I.worn_icon_state = initial(picked_item.worn_icon_state) I.inhand_icon_state = initial(picked_item.inhand_icon_state) - I.item_color = initial(picked_item.item_color) I.color = initial(picked_item.color) I.worn_icon = initial(picked_item.worn_icon) @@ -239,7 +238,6 @@ icon_state = "black" worn_icon = 'icons/mob/clothing/under/color.dmi' inhand_icon_state = "bl_suit" - item_color = "black" random_sensor = FALSE resistance_flags = NONE armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50) @@ -449,8 +447,7 @@ desc = "It's a baseball hat in a tasteful grey colour." icon = 'icons/obj/clothing/head/softcap.dmi' worn_icon = 'icons/mob/clothing/head/softcap.dmi' - icon_state = "greysoft" - item_color = "grey" + icon_state = "grey" resistance_flags = NONE armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50) @@ -542,7 +539,6 @@ /obj/item/clothing/shoes/chameleon name = "black shoes" icon_state = "black" - item_color = "black" desc = "A pair of black shoes." dyeable = FALSE permeability_coefficient = 0.05 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 475216c7d74..5ee9bc28ac9 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1013,7 +1013,6 @@ var/list/accessories = list() var/displays_id = TRUE var/rolled_down = FALSE - var/basecolor /obj/item/clothing/under/rank inhand_icon_state = "bl_suit" @@ -1141,36 +1140,38 @@ . += "Alt-Shift-Click to remove an accessory." . += "Ctrl-Shift-Click to roll down this jumpsuit." +/// Suffix for jumpsuits used in .dmi files when rolled down +#define JUMPSUIT_ROLLED_DOWN_SUFFIX "_d" + +/obj/item/clothing/under/proc/roll_undersuit(mob/living/carbon/human/user) + if(copytext(icon_state, -length(JUMPSUIT_ROLLED_DOWN_SUFFIX)) != JUMPSUIT_ROLLED_DOWN_SUFFIX) + base_icon_state = icon_state + + var/current_worn_icon = LAZYACCESS(sprite_sheets, user.dna.species.sprite_sheet_name) || worn_icon || 'icons/mob/clothing/under/misc.dmi' + if(!icon_exists(current_worn_icon, "[base_icon_state][JUMPSUIT_ROLLED_DOWN_SUFFIX]_s")) + to_chat(user, "You cannot roll down this uniform!") + return + + rolled_down = !rolled_down + if(rolled_down) + body_parts_covered &= ~(UPPER_TORSO | LOWER_TORSO | ARMS) + else + body_parts_covered = initial(body_parts_covered) + worn_icon_state = "[base_icon_state][rolled_down ? "[JUMPSUIT_ROLLED_DOWN_SUFFIX]" : ""]" + user.update_inv_w_uniform() + +#undef JUMPSUIT_ROLLED_DOWN_SUFFIX /obj/item/clothing/under/CtrlShiftClick(mob/living/carbon/human/user) if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user) || !istype(user)) to_chat(user, "You cannot roll down the uniform!") return - if(copytext(item_color,-2) != "_d") - basecolor = item_color - if(user.get_item_by_slot(ITEM_SLOT_JUMPSUIT) != src) to_chat(user, "You must wear the uniform to adjust it!") + return - else - if((basecolor + "_d_s") in icon_states(user.w_uniform.sprite_sheets[user.dna.species.sprite_sheet_name])) - if(user.w_uniform.sprite_sheets[user.dna.species.sprite_sheet_name] && icon_exists(user.w_uniform.sprite_sheets[user.dna.species.sprite_sheet_name], "[basecolor]_d_s")) - item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]" - user.update_inv_w_uniform() - - else - if(icon_exists(user.w_uniform.worn_icon, "[basecolor]_d_s") || icon_exists('icons/mob/clothing/under/misc.dmi', "[basecolor]_d_s")) - item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]" - user.update_inv_w_uniform() - else - to_chat(user, "You cannot roll down this uniform!") - if(item_color == "[basecolor]") - body_parts_covered = initial(body_parts_covered) - else - body_parts_covered &= ~UPPER_TORSO - body_parts_covered &= ~LOWER_TORSO - body_parts_covered &= ~ARMS + roll_undersuit(user) /obj/item/clothing/under/AltShiftClick(mob/user) if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user)) diff --git a/code/modules/clothing/gloves/colored_gloves.dm b/code/modules/clothing/gloves/colored_gloves.dm index 96fafb0ef2f..476845d6e29 100644 --- a/code/modules/clothing/gloves/colored_gloves.dm +++ b/code/modules/clothing/gloves/colored_gloves.dm @@ -7,7 +7,6 @@ icon_state = "yellow" siemens_coefficient = 0 permeability_coefficient = 0.01 - item_color = "yellow" resistance_flags = NONE /obj/item/clothing/gloves/color/yellow/fake @@ -20,7 +19,6 @@ icon_state = "yellow" siemens_coefficient = 1 //Set to a default of 1, gets overridden in New() permeability_coefficient = 0.01 - item_color = "yellow" resistance_flags = NONE /obj/item/clothing/gloves/color/fyellow/Initialize(mapload) @@ -40,7 +38,6 @@ desc = "A pair of black gloves made of fire-resistant fabric." icon_state = "black" inhand_icon_state = "bgloves" - item_color = "black" cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS @@ -83,13 +80,11 @@ name = "orange gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "orange" - item_color = "orange" /obj/item/clothing/gloves/color/red name = "red gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "red" - item_color = "red" /obj/item/clothing/gloves/color/red/insulated name = "insulated gloves" @@ -102,47 +97,39 @@ name = "rainbow gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "rainbow" - item_color = "rainbow" /obj/item/clothing/gloves/color/rainbow/clown - item_color = "clown" /obj/item/clothing/gloves/color/blue name = "blue gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "blue" - item_color = "blue" /obj/item/clothing/gloves/color/purple name = "purple gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "purple" - item_color = "purple" /obj/item/clothing/gloves/color/green name = "green gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "green" - item_color = "green" /obj/item/clothing/gloves/color/grey name = "grey gloves" desc = "A pair of gloves, they don't look special in any way." - icon_state = "gray" // <----- + icon_state = "gray" inhand_icon_state = "bgloves" - item_color = "grey" // <----- /obj/item/clothing/gloves/color/light_brown name = "light brown gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "lightbrown" - item_color = "light brown" /obj/item/clothing/gloves/color/brown name = "brown gloves" desc = "A pair of gloves, they don't look special in any way." icon_state = "brown" - item_color = "brown" /obj/item/clothing/gloves/color/latex name = "latex gloves" @@ -151,7 +138,6 @@ inhand_icon_state = "lgloves" siemens_coefficient = 0.30 permeability_coefficient = 0.01 - item_color = "white" transfer_prints = TRUE resistance_flags = NONE @@ -160,14 +146,12 @@ desc = "A pair of high-quality sterile gloves made from thick nitrile material. " icon_state = "nitrile" transfer_prints = FALSE - item_color = "medical" /obj/item/clothing/gloves/color/white name = "white gloves" desc = "A pair of white silk gloves for individuals of class and discerning taste." icon_state = "white" inhand_icon_state = "lgloves" - item_color = "mime" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/gloves.dmi', "Drask" = 'icons/mob/clothing/species/drask/gloves.dmi', @@ -179,7 +163,6 @@ name = "captain's gloves" desc = "A pair of very expensive gloves made of reinforced blue & gold fabric. They're insulated against both electrical shocks and extreme temperatures." icon_state = "captain" - item_color = "captain" siemens_coefficient = 0 permeability_coefficient = 0.01 cold_protection = HANDS diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm index 2f9e4cfc1dc..b588bd8dcd3 100644 --- a/code/modules/clothing/head/beanie.dm +++ b/code/modules/clothing/head/beanie.dm @@ -8,7 +8,6 @@ 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 = "beanie" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head.dmi', ) @@ -52,43 +51,35 @@ /obj/item/clothing/head/beanie/christmas name = "christmas beanie" icon_state = "beaniechristmas" - item_color = "beaniechristmas" /obj/item/clothing/head/beanie/striped name = "striped beanie" icon_state = "beaniestriped" - item_color = "beaniestriped" /obj/item/clothing/head/beanie/stripedred name = "red striped beanie" icon_state = "beaniestripedred" - item_color = "beaniestripedred" /obj/item/clothing/head/beanie/stripedblue name = "blue striped beanie" icon_state = "beaniestripedblue" - item_color = "beaniestripedblue" /obj/item/clothing/head/beanie/stripedgreen name = "green striped beanie" icon_state = "beaniestripedgreen" - item_color = "beaniestripedgreen" /obj/item/clothing/head/beanie/durathread name = "durathread beanie" desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer." icon_state = "beaniedurathread" - item_color = null armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 5, RAD = 0, FIRE = 20, ACID = 5) /obj/item/clothing/head/beanie/waldo name = "red striped bobble hat" desc = "If you're going on a worldwide hike, you'll need some cold protection." icon_state = "waldo_hat" - item_color = "waldo_hat" /obj/item/clothing/head/beanie/rasta name = "rastacap" desc = "Perfect for tucking in those dreadlocks." icon_state = "beanierasta" - item_color = "beanierasta" diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index fc6cedd1271..b421d442b1f 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -36,7 +36,6 @@ name = "durathread beret" desc = "A beret made from durathread, its resilient fibres provide some protection to the wearer." icon_state = "beret_durathread" - item_color = null armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 5, RAD = 0, FIRE = 20, ACID = 5) //Central Command @@ -258,7 +257,6 @@ name = "mining beret" desc = "An brown beret with a purple insignia emblazoned on it. Won't help you against the atmosphere of the planet, but will look stylish." icon_state = "beret_mining" - item_color = "beret_mining" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', @@ -269,7 +267,6 @@ name = "expedition beret" desc = "A brown beret with a blue Nanotrasen insignia emblazoned on it. Not much good for space protection, but stylish all the same." icon_state = "beret_expedition" - item_color = "beret_expedition" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50) strip_delay = 6 SECONDS sprite_sheets = list( @@ -282,7 +279,6 @@ name = "smith's beret" desc = "A brown beret with a black insignia emblazoned on it. Won't help you against the atmosphere of the planet, but will look stylish." icon_state = "beret_smith" - item_color = "beret_smith" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', @@ -318,7 +314,6 @@ name = "\improper TSF Lieutenant's beret" desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." icon_state = "beret_solgovc" - item_color = "solgovc" dog_fashion = null armor = list(MELEE = 10, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75) strip_delay = 80 @@ -328,7 +323,6 @@ desc = "A beret worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. The insignia signifies the wearer bears the rank of a Lieutenant." armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200) icon_state = "beret_solgovcelite" - item_color = "solgovcelite" resistance_flags = FIRE_PROOF //Traitor @@ -336,7 +330,6 @@ name = "syndicate beret" desc = "A dark grey beret with the Syndicate’s unmistakable 'S' logo emblazoned on it. Wearing this just for the looks might not be the wisest idea..." icon_state = "beret_syndie" - item_color = "beret_syndie" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 5f6906d292c..cd3947861be 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -5,7 +5,6 @@ icon_state = "hardhat0_yellow" var/brightness_on = 4 //luminosity when on var/on = FALSE - item_color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite) armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 10, FIRE = INFINITY, ACID = 50) flags_inv = 0 actions_types = list(/datum/action/item_action/toggle_helmet_light) @@ -15,6 +14,8 @@ "Grey" = 'icons/mob/clothing/species/grey/head.dmi', "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) + /// Determines used sprites: hardhat[on]_[hat_color] + var/hat_color = "yellow" /obj/item/clothing/head/hardhat/attack_self__legacy__attackchain(mob/living/user) toggle_helmet_light(user) @@ -28,7 +29,7 @@ update_icon(UPDATE_ICON_STATE) /obj/item/clothing/head/hardhat/update_icon_state() - icon_state = "hardhat[on]_[item_color]" + icon_state = "hardhat[on]_[hat_color]" if(ishuman(loc)) var/mob/living/carbon/human/H = loc H.update_inv_head() @@ -50,12 +51,12 @@ /obj/item/clothing/head/hardhat/orange name = "orange hard hat" icon_state = "hardhat0_orange" - item_color = "orange" + hat_color = "orange" /obj/item/clothing/head/hardhat/red name = "firefighter helmet" icon_state = "hardhat0_red" - item_color = "red" + hat_color = "red" flags = STOPSPRESSUREDMAGE heat_protection = HEAD max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT @@ -66,7 +67,7 @@ /obj/item/clothing/head/hardhat/white name = "white hard hat" icon_state = "hardhat0_white" - item_color = "white" + hat_color = "white" flags = STOPSPRESSUREDMAGE heat_protection = HEAD max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT @@ -77,7 +78,7 @@ /obj/item/clothing/head/hardhat/dblue name = "blue hard hat" icon_state = "hardhat0_dblue" - item_color = "dblue" + hat_color = "dblue" /obj/item/clothing/head/hardhat/atmos name = "atmospheric technician's firefighting helmet" @@ -85,7 +86,7 @@ icon = 'icons/obj/clothing/head/utility.dmi' worn_icon = 'icons/mob/clothing/head/utility.dmi' icon_state = "hardhat0_atmos" - item_color = "atmos" + hat_color = "atmos" flags = STOPSPRESSUREDMAGE flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE heat_protection = HEAD @@ -106,7 +107,7 @@ /obj/item/clothing/head/hardhat/durathread name = "durathread hard hat" icon_state = "hardhat0_durathread" - item_color = "durathread" + hat_color = "durathread" desc = "A hard hat made from durathread, leather, and light fixture components." armor = list(MELEE = 10, BULLET = 5, LASER = 20, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 35, ACID = 50) sprite_sheets = list( diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index f65d71794ea..66f08148b26 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -138,7 +138,7 @@ name = "carved pumpkin" desc = "A jack o' lantern! Believed to ward off evil spirits." icon_state = "hardhat0_pumpkin"//Could stand to be renamed - item_color = "pumpkin" + hat_color = "pumpkin" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH @@ -151,14 +151,14 @@ name = "carved blumpkin" desc = "A very blue jack o' lantern! Believed to ward off vengeful chemists." icon_state = "hardhat0_blumpkin" - item_color = "blumpkin" + hat_color = "blumpkin" light_color = "#76ff8e" /obj/item/clothing/head/hardhat/reindeer name = "novelty reindeer hat" desc = "Some fake antlers and a very fake red nose." icon_state = "hardhat0_reindeer" - item_color = "reindeer" + hat_color = "reindeer" armor = null brightness_on = 1 //luminosity when on dog_fashion = /datum/dog_fashion/head/reindeer diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 5e8535bc585..0cb3b085d6e 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -2,22 +2,29 @@ name = "grey cap" desc = "It's a baseball hat in a tasteless grey colour." icon = 'icons/obj/clothing/head/softcap.dmi' - icon_state = "greysoft" + icon_state = "grey" worn_icon = 'icons/mob/clothing/head/softcap.dmi' - item_color = "grey" - var/flipped = FALSE actions_types = list(/datum/action/item_action/flip_cap) dog_fashion = /datum/dog_fashion/head/softcap sprite_sheets = list( "Kidan" = 'icons/mob/clothing/species/kidan/head/softcap.dmi', "Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi' - ) + ) dyeable = TRUE + /// Is the cap flipped? Affects sprite + var/flipped = FALSE + +/obj/item/clothing/head/soft/Initialize(mapload) + . = ..() + update_icon(UPDATE_ICON_STATE) /obj/item/clothing/head/soft/dropped() - icon_state = "[item_color]soft" flipped = FALSE - ..() + update_icon(UPDATE_ICON_STATE) + return ..() + +/obj/item/clothing/head/soft/update_icon_state() + icon_state = "[initial(icon_state)][flipped ? "_flipped" : ""]" /obj/item/clothing/head/soft/attack_self__legacy__attackchain(mob/user) flip(user) @@ -25,175 +32,147 @@ /obj/item/clothing/head/soft/proc/flip(mob/user) flipped = !flipped if(flipped) - icon_state = "[item_color]soft_flipped" to_chat(usr, "You flip the hat backwards.") else - icon_state = "[item_color]soft" to_chat(user, "You flip the hat back in normal position.") + update_icon(UPDATE_ICON_STATE) user.update_inv_head() //so our mob-overlays update - update_action_buttons() /obj/item/clothing/head/soft/red name = "red cap" desc = "It's a baseball hat in a tasteless red colour." - icon_state = "redsoft" - item_color = "red" + icon_state = "red" /obj/item/clothing/head/soft/blue name = "blue cap" desc = "It's a baseball hat in a tasteless blue colour." - icon_state = "bluesoft" - item_color = "blue" + icon_state = "blue" /obj/item/clothing/head/soft/green name = "green cap" desc = "It's a baseball hat in a tasteless green colour." - icon_state = "greensoft" - item_color = "green" + icon_state = "green" /obj/item/clothing/head/soft/yellow name = "yellow cap" desc = "It's a baseball hat in a tasteless yellow colour." - icon_state = "yellowsoft" - item_color = "yellow" + icon_state = "yellow" /obj/item/clothing/head/soft/orange name = "orange cap" desc = "It's a baseball hat in a tasteless orange colour." - icon_state = "orangesoft" - item_color = "orange" + icon_state = "orange" /obj/item/clothing/head/soft/white name = "white cap" desc = "It's a baseball hat in a tasteless white colour." - icon_state = "whitesoft" - item_color = "white" + icon_state = "white" /obj/item/clothing/head/soft/purple name = "purple cap" desc = "It's a baseball hat in a tasteless purple colour." - icon_state = "purplesoft" - item_color = "purple" + icon_state = "purple" /obj/item/clothing/head/soft/black name = "black cap" desc = "It's a baseball hat in a tasteless black colour." - icon_state = "blacksoft" - item_color = "black" + icon_state = "black" /obj/item/clothing/head/soft/rainbow name = "rainbow cap" desc = "It's a baseball hat in a bright rainbow of colors." - icon_state = "rainbowsoft" - item_color = "rainbow" + icon_state = "rainbow" /obj/item/clothing/head/soft/cargo name = "cargo cap" desc = "It's a brown baseball hat with a grey cargo technician shield." - icon_state = "cargosoft" - item_color = "cargo" + icon_state = "cargo" dog_fashion = /datum/dog_fashion/head/cargo_tech /obj/item/clothing/head/soft/mining name = "mining cap" desc = "It's an brown hard peaked baseball hat with a purple miner shield." - icon_state = "miningsoft" - item_color = "mining" + icon_state = "mining" dog_fashion = /datum/dog_fashion/head/miningsoft /obj/item/clothing/head/soft/expedition name = "expedition cap" desc = "It's a baseball hat in the brown and blue markings of the expedition team." - icon_state = "expeditionsoft" - item_color = "expedition" + icon_state = "expedition" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50) /obj/item/clothing/head/soft/smith name = "smith's cap" desc = "It's a brown baseball hat with a black smithing shield." - icon_state = "smithsoft" - item_color = "smith" + icon_state = "smith" dog_fashion = /datum/dog_fashion/head/smith /obj/item/clothing/head/soft/janitorgrey name = "grey janitor's cap" desc = "It's a grey baseball hat with a purple custodial shield." - icon_state = "janitorgreysoft" - item_color = "janitorgrey" + icon_state = "janitorgrey" /obj/item/clothing/head/soft/janitorpurple name = "purple janitor's cap" desc = "It's a purple baseball hat with a mint service shield." - icon_state = "janitorpurplesoft" - item_color = "janitorpurple" + icon_state = "janitorpurple" /obj/item/clothing/head/soft/hydroponics name = "botanist's cap" desc = "It's a green baseball hat with a blue service shield." - icon_state = "hydroponicssoft" - item_color = "hydroponics" + icon_state = "hydroponics" /obj/item/clothing/head/soft/hydroponics_alt name = "hydroponics cap" desc = "It's a green baseball hat with a brown service shield." - icon_state = "hydroponics_altsoft" - item_color = "hydroponics_alt" + icon_state = "hydroponics_alt" /obj/item/clothing/head/soft/paramedic name = "\improper EMT cap" desc = "It's a blue baseball hat with a white medical shield." - icon_state = "paramedicsoft" - item_color = "paramedic" + icon_state = "paramedic" dog_fashion = /datum/dog_fashion/head/paramedic /obj/item/clothing/head/soft/sec name = "security cap" desc = "It's baseball hat in tasteful red colour." - icon_state = "secsoft" - item_color = "sec" + icon_state = "sec" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50) strip_delay = 60 /obj/item/clothing/head/soft/sec/corp name = "corporate security cap" desc = "It's a baseball hat in corporate colours." - icon_state = "corpsoft" - item_color = "corp" + icon_state = "corp" /obj/item/clothing/head/soft/solgov name = "\improper TSF marine cap" desc = "A soft cap worn by marines of the Trans-Solar Federation." - icon_state = "solgovsoft" - item_color = "solgov" + icon_state = "solgov" dog_fashion = null /obj/item/clothing/head/soft/solgov/marines armor = list(MELEE = 10, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75) - icon_state = "solgovsoft_flipped" - strip_delay = 60 + strip_delay = 6 SECONDS flipped = TRUE /obj/item/clothing/head/soft/solgov/marines/elite name = "\improper MARSOC cap" desc = "A cap worn by marines of the Trans-Solar Federation's Marine Special Operations Command. You aren't quite sure how they made this bulletproof, but you are glad it is!" + icon_state = "solgovelite" armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200) - icon_state = "solgovelitesoft_flipped" - item_color = "solgovelite" resistance_flags = FIRE_PROOF /obj/item/clothing/head/soft/solgov/marines/command name = "\improper TSF marine lieutenant's cap" desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." - icon_state = "solgovcsoft_flipped" - item_color = "solgovc" - dog_fashion = null - strip_delay = 80 + icon_state = "solgovc" + strip_delay = 8 SECONDS /obj/item/clothing/head/soft/solgov/marines/command/elite name = "\improper MARSOC Lieutenant's cap" desc = "A cap worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant." armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200) - icon_state = "solgovcelitesoft_flipped" - item_color = "solgovcelite" + icon_state = "solgovcelite" resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm index eb4967c7438..2af039e79ee 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -419,37 +419,31 @@ /obj/item/clothing/mask/bandana/red name = "red bandana" icon_state = "bandred" - item_color = "red" desc = "It's a red bandana." /obj/item/clothing/mask/bandana/blue name = "blue bandana" icon_state = "bandblue" - item_color = "blue" desc = "It's a blue bandana." /obj/item/clothing/mask/bandana/gold name = "gold bandana" icon_state = "bandgold" - item_color = "yellow" desc = "It's a gold bandana." /obj/item/clothing/mask/bandana/green name = "green bandana" icon_state = "bandgreen" - item_color = "green" desc = "It's a green bandana." /obj/item/clothing/mask/bandana/orange name = "orange bandana" icon_state = "bandorange" - item_color = "orange" desc = "It's an orange bandana." /obj/item/clothing/mask/bandana/purple name = "purple bandana" icon_state = "bandpurple" - item_color = "purple" desc = "It's a purple bandana." /obj/item/clothing/mask/bandana/botany @@ -464,7 +458,6 @@ /obj/item/clothing/mask/bandana/black name = "black bandana" icon_state = "bandblack" - item_color = "black" desc = "It's a black bandana." /obj/item/clothing/mask/bandana/durathread diff --git a/code/modules/clothing/neck/neck.dm b/code/modules/clothing/neck/neck.dm index e8876d9ccba..4e0d88ce46e 100644 --- a/code/modules/clothing/neck/neck.dm +++ b/code/modules/clothing/neck/neck.dm @@ -6,23 +6,19 @@ /obj/item/clothing/neck/tie/blue name = "blue tie" icon_state = "bluetie" - item_color = "bluetie" /obj/item/clothing/neck/tie/red name = "red tie" icon_state = "redtie" - item_color = "redtie" /obj/item/clothing/neck/tie/black name = "black tie" icon_state = "blacktie" - item_color = "blacktie" /obj/item/clothing/neck/tie/horrible name = "horrible tie" desc = "A neosilk clip-on tie. This one is disgusting." icon_state = "horribletie" - item_color = "horribletie" /obj/item/clothing/neck/tie/examine(mob/user) . = ..() @@ -41,7 +37,6 @@ name = "stethoscope" desc = "An outdated medical apparatus, used to get a rough idea of the condition of the heart and lungs. It also makes you look like you know what you're doing." icon_state = "stethoscope" - item_color = "stethoscope" /obj/item/clothing/neck/stethoscope/attack__legacy__attackchain(mob/living/carbon/human/M, mob/living/user) if(!ishuman(M) || !isliving(user)) diff --git a/code/modules/clothing/neck/necklace.dm b/code/modules/clothing/neck/necklace.dm index 2ff04354cea..5655fc3d054 100644 --- a/code/modules/clothing/neck/necklace.dm +++ b/code/modules/clothing/neck/necklace.dm @@ -1,25 +1,21 @@ /obj/item/clothing/neck/necklace desc = "A simple necklace." icon_state = "necklace" - item_color = "necklace" /obj/item/clothing/neck/necklace/long name = "large necklace" desc = "A large necklace." icon_state = "necklacelong" - item_color = "necklacelong" /obj/item/clothing/neck/necklace/dope name = "gold necklace" desc = "Damn, it feels good to be a gangster." icon_state = "bling" - item_color = "bling" /obj/item/clothing/neck/necklace/locket name = "gold locket" desc = "A gold locket that seems to have space for a photo within." icon_state = "locketgold" - item_color = "locketgold" var/base_icon var/open /// Item inside locket. @@ -69,4 +65,3 @@ name = "silver locket" desc = "A silver locket that seems to have space for a photo within." icon_state = "locketsilver" - item_color = "locketsilver" diff --git a/code/modules/clothing/neck/scarfs.dm b/code/modules/clothing/neck/scarfs.dm index c92ac52fba8..ebe3f1e0c26 100644 --- a/code/modules/clothing/neck/scarfs.dm +++ b/code/modules/clothing/neck/scarfs.dm @@ -6,72 +6,58 @@ /obj/item/clothing/neck/scarf/red name = "red scarf" icon_state = "redscarf" - item_color = "redscarf" /obj/item/clothing/neck/scarf/green name = "green scarf" icon_state = "greenscarf" - item_color = "greenscarf" /obj/item/clothing/neck/scarf/darkblue name = "dark blue scarf" icon_state = "darkbluescarf" - item_color = "darkbluescarf" /obj/item/clothing/neck/scarf/purple name = "purple scarf" icon_state = "purplescarf" - item_color = "purplescarf" /obj/item/clothing/neck/scarf/yellow name = "yellow scarf" icon_state = "yellowscarf" - item_color = "yellowscarf" /obj/item/clothing/neck/scarf/orange name = "orange scarf" icon_state = "orangescarf" - item_color = "orangescarf" /obj/item/clothing/neck/scarf/lightblue name = "light blue scarf" icon_state = "lightbluescarf" - item_color = "lightbluescarf" /obj/item/clothing/neck/scarf/white name = "white scarf" icon_state = "whitescarf" - item_color = "whitescarf" /obj/item/clothing/neck/scarf/black name = "black scarf" icon_state = "blackscarf" - item_color = "blackscarf" /obj/item/clothing/neck/scarf/zebra name = "zebra scarf" icon_state = "zebrascarf" - item_color = "zebrascarf" /obj/item/clothing/neck/scarf/christmas name = "christmas scarf" icon_state = "christmasscarf" - item_color = "christmasscarf" /obj/item/clothing/neck/scarf/stripedred name = "striped red scarf" icon_state = "stripedredscarf" - item_color = "stripedredscarf" dog_fashion = null /obj/item/clothing/neck/scarf/stripedgreen name = "striped green scarf" icon_state = "stripedgreenscarf" - item_color = "stripedgreenscarf" dog_fashion = null /obj/item/clothing/neck/scarf/stripedblue name = "striped blue scarf" icon_state = "stripedbluescarf" - item_color = "stripedbluescarf" dog_fashion = null diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index 8260c322c50..1c74acd9dd2 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 @@ -16,45 +15,37 @@ name = "brown shoes" desc = "A pair of brown shoes." icon_state = "brown" - item_color = "brown" /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/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/leather/jump name = "boots of jumping" @@ -76,12 +67,10 @@ 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/restraints/handcuffs/shackles /obj/item/clothing/shoes/orange/Destroy() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 227c0a415ea..f0e16628755 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -132,7 +132,6 @@ slowdown_active = SHOES_SLOWDOWN+1 slowdown_passive = SHOES_SLOWDOWN+1 magpulse_name = "honk-powered traction system" - item_color = "clown" origin_tech = "magnets=4;syndicate=2" var/enabled_waddle = TRUE diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 9ffa4e83d0f..96795c028c1 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -1,7 +1,6 @@ /obj/item/clothing/shoes/mime name = "mime shoes" icon_state = "mime" - item_color = "mime" /// basic syndicate combat boots for nuke ops and mob corpses /obj/item/clothing/shoes/combat @@ -85,7 +84,6 @@ icon_state = "clown" inhand_icon_state = "clown_shoes" slowdown = SHOES_SLOWDOWN+1 - item_color = "clown" // "Dyeable" in this case is a bit of an understatement, washing these // with a crayon will give them the appearance and name of normal // shoes, but the functionality of clown shoes. @@ -190,7 +188,6 @@ desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." icon_state = "jackboots" inhand_icon_state = "jackboots" - item_color = "hosred" can_cut_open = 1 strip_delay = 50 put_on_delay = 50 @@ -202,7 +199,6 @@ desc = "Nanotrasen-issue Security combat sandals for combat scenarios. They're jacksandals, however that works." can_cut_open = 0 icon_state = "jacksandal" - item_color = "jacksandal" /obj/item/clothing/shoes/jackboots/noisy name = "heavy jackboots" @@ -255,7 +251,6 @@ name = "boots" desc = "A pair of boots usually worn by cultists." icon_state = "cult" - item_color = "cult" cold_protection = FEET min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT heat_protection = FEET @@ -312,7 +307,6 @@ name = "noble boots" desc = "The boots are economically designed to balance function and comfort, so that you can step on peasants without having to worry about blisters. The leather also resists unwanted blood stains." icon_state = "noble_boot" - item_color = "noble_boot" dyeable = FALSE /obj/item/clothing/shoes/furboots @@ -325,13 +319,11 @@ name = "white sandals" desc = "Medical sandals that nerds wear." icon_state = "medsandal" - item_color = "medsandal" /obj/item/clothing/shoes/sandal/fancy name = "fancy sandals" desc = "FANCY!!." icon_state = "fancysandal" - item_color = "fancysandal" /obj/item/clothing/shoes/cursedclown name = "cursed clown shoes" @@ -378,32 +370,27 @@ name = "cowboy boots" desc = "A pair a' brown boots." icon_state = "cowboy_brown" - item_color = "cowboy_brown" dyeable = FALSE /obj/item/clothing/shoes/cowboy/black name = "black cowboy boots" desc = "A pair a' black rustlers' boots." icon_state = "cowboy_black" - item_color = "cowboy_black" /obj/item/clothing/shoes/cowboy/white name = "white cowboy boots" desc = "For the rancher in us all." icon_state = "cowboy_white" - item_color = "cowboy_white" /obj/item/clothing/shoes/cowboy/fancy name = "bilton wrangler boots" desc = "A pair of authentic haute couture boots from Japanifornia. You doubt they have ever been close to cattle." icon_state = "cowboy_fancy" - item_color = "cowboy_fancy" /obj/item/clothing/shoes/cowboy/pink name = "pink cowgirl boots" desc = "For a Rustlin' tustlin' cowgirl." icon_state = "cowboyboots_pink" - item_color = "cowboyboots_pink" /obj/item/clothing/shoes/cowboy/lizard name = "lizard skin boots" @@ -435,7 +422,6 @@ name = "jump boots" desc = "A specialized pair of combat boots with a built-in propulsion system for rapid forward movement." icon_state = "jetboots" - item_color = "hosred" resistance_flags = FIRE_PROOF actions_types = list(/datum/action/item_action/bhop) permeability_coefficient = 0.05 diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm index ea0b5b11ce3..91b0a1ce584 100644 --- a/code/modules/clothing/spacesuits/alien_suits.dm +++ b/code/modules/clothing/spacesuits/alien_suits.dm @@ -6,11 +6,9 @@ /obj/item/clothing/head/helmet/space/skrell/white icon_state = "skrell_helmet_white" - item_color = "skrell_helmet_white" /obj/item/clothing/head/helmet/space/skrell/black icon_state = "skrell_helmet_black" - item_color = "skrell_helmet_black" /obj/item/clothing/suit/space/skrell name = "skrellian hardsuit" @@ -19,11 +17,9 @@ /obj/item/clothing/suit/space/skrell/white icon_state = "skrell_suit_white" - item_color = "skrell_suit_white" /obj/item/clothing/suit/space/skrell/black icon_state = "skrell_suit_black" - item_color = "skrell_suit_black" //Unathi space gear. Huge and restrictive. /obj/item/clothing/head/helmet/space/unathi @@ -38,7 +34,6 @@ name = "NT breacher helmet" desc = "Hey! Watch it with that thing! It's a knock-off of an Unathi battle-helm, and that spike could put someone's eye out." icon_state = "unathi_helm_cheap" - item_color = "unathi_helm_cheap" /obj/item/clothing/suit/space/unathi icon = 'icons/obj/clothing/species/unathi/suits.dmi' @@ -57,13 +52,11 @@ name = "breacher helm" desc = "Weathered, ancient and battle-scarred. The helmet is too." icon_state = "unathi_breacher" - item_color = "unathi_breacher" /obj/item/clothing/suit/space/unathi/breacher name = "breacher chassis" desc = "Huge, bulky and absurdly heavy. It must be like wearing a tank." icon_state = "unathi_breacher" - item_color = "unathi_breacher" // Vox space gear (vaccuum suit, low pressure armour) // Can't be equipped by any other species due to bone structure and vox cybernetics. @@ -139,14 +132,12 @@ name = "Vox jumpsuit" desc = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement." icon_state = "vox-jumpsuit_s" - item_color = "vox-jumpsuit" /obj/item/clothing/suit/hooded/vox_robes name = "Vox robes" desc = "Large, comfortable robes worn by those who need a bit more covering. The thick fabric contains a pocket suitable for those that need their hands free during their work, while the cloth serves to cover scars or other injuries to the wearer's body." icon = 'icons/mob/clothing/species/vox/suit.dmi' icon_state = "vox-robes" - item_color = "vox-robes" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/vox_robe_hood species_restricted = list("Vox") @@ -160,7 +151,6 @@ desc = "The thick fabric of this hood serves a variety of purposes to the vox wearing it - serving as a method to hide a scarred face or a way to keep warm in the coldest areas onboard the ship." icon = 'icons/mob/clothing/species/vox/head.dmi' icon_state = "vox-robes-hood" - item_color = "vox-robes-hood" flags = BLOCKHAIR flags_cover = HEADCOVERSEYES species_restricted = list("Vox") @@ -170,7 +160,6 @@ name = "insulated gauntlets" desc = "These bizarre gauntlets seem to be fitted for... bird claws?" icon_state = "gloves-vox" - item_color = "gloves-vox" icon = 'icons/obj/clothing/species/vox/gloves.dmi' species_restricted = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/gloves.dmi') diff --git a/code/modules/clothing/spacesuits/ert_hardsuits.dm b/code/modules/clothing/spacesuits/ert_hardsuits.dm index a5b7d6a073f..ad70b1fb0bf 100644 --- a/code/modules/clothing/spacesuits/ert_hardsuits.dm +++ b/code/modules/clothing/spacesuits/ert_hardsuits.dm @@ -3,7 +3,7 @@ name = "emergency response team helmet" desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility." icon_state = "hardsuit0-ert_commander" - item_color = "ert_commander" + base_icon_state = "ert_commander" armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200) resistance_flags = FIRE_PROOF var/obj/machinery/camera/portable/camera @@ -87,7 +87,7 @@ name = "emergency response team security helmet" desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has red Security stripes." icon_state = "hardsuit0-ert_security" - item_color = "ert_security" + base_icon_state = "ert_security" /obj/item/clothing/suit/space/hardsuit/ert/security name = "emergency response team security suit" @@ -107,7 +107,7 @@ desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has orange Engineering stripes, and additional lead plating for improved radiation protection." armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 150, FIRE = 200, ACID = 200) icon_state = "hardsuit0-ert_engineer" - item_color = "ert_engineer" + base_icon_state = "ert_engineer" /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma name = "elite emergency response team engineer helmet" @@ -115,7 +115,7 @@ armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = INFINITY, FIRE = 200, ACID = 200) flags_2 = RAD_PROTECT_CONTENTS_2 icon_state = "hardsuit0-gammaengineer" - item_color = "gammaengineer" + base_icon_state = "gammaengineer" /obj/item/clothing/suit/space/hardsuit/ert/engineer name = "emergency response team engineer suit" @@ -138,7 +138,7 @@ name = "emergency response team medical helmet" desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one's got white Medical stripes." icon_state = "hardsuit0-ert_medical" - item_color = "ert_medical" + base_icon_state = "ert_medical" /obj/item/clothing/suit/space/hardsuit/ert/medical name = "emergency response team medical suit" @@ -156,7 +156,7 @@ name = "emergency response team janitor helmet" desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has purple Janitorial stripes." icon_state = "hardsuit0-ert_janitor" - item_color = "ert_janitor" + base_icon_state = "ert_janitor" /obj/item/clothing/suit/space/hardsuit/ert/janitor name = "emergency response team janitor suit" @@ -169,7 +169,7 @@ name = "paranormal response unit helmet" desc = "An environmentally-sealed combat helmet covered in runes and warding sigils. The internal HUD is fairly outdated, and has Latin as a selectable language." icon_state = "hardsuit0-ert_paranormal" - item_color = "ert_paranormal" + base_icon_state = "ert_paranormal" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT sprite_sheets = list( "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', @@ -204,7 +204,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT desc = "A helmet worn by marines of the Trans-Solar Federation's Marine Special Operations Command. Armored, space ready, and fireproof." icon_state = "hardsuit0-solgovmarine" - item_color = "solgovmarine" + base_icon_state = "solgovmarine" armor = list(MELEE = 25, BULLET = 75, LASER = 10, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY) /obj/item/clothing/suit/space/hardsuit/ert/solgov @@ -219,7 +219,7 @@ name = "\improper MARSOC officer's helmet" desc = "A helmet worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof." icon_state = "hardsuit0-solgovcommand" - item_color = "solgovcommand" + base_icon_state = "solgovcommand" /obj/item/clothing/suit/space/hardsuit/ert/solgov/command name = "\improper MARSOC officer's hardsuit" diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 2278d635242..9d078ed8cd6 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -2,15 +2,15 @@ /obj/item/clothing/head/helmet/space/hardsuit name = "hardsuit helmet" icon_state = null + base_icon_state = "engineering" max_integrity = 300 armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 150, FIRE = 50, ACID = 150) - var/basestate = "hardsuit" allowed = list(/obj/item/flashlight) + actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_geiger_counter) + var/basestate = "hardsuit" var/brightness_on = 4 //luminosity when on var/on = FALSE var/obj/item/clothing/suit/space/hardsuit/suit - item_color = "engineering" //Determines used sprites: hardsuit[on]-[color] and hardsuit[on]-[color]2 (lying down sprite) - actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_geiger_counter) var/scanning = TRUE var/current_tick_amount = 0 @@ -46,7 +46,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/proc/toggle_light(mob/user) on = !on - icon_state = "[basestate][on]-[item_color]" + icon_state = "[basestate][on]-[base_icon_state]" if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -237,7 +237,7 @@ desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." alt_desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." icon_state = "hardsuit1-syndi" - item_color = "syndi" + base_icon_state = "syndi" armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = 50, ACID = 450) on = TRUE var/obj/item/clothing/suit/space/hardsuit/syndi/linkedsuit = null @@ -246,7 +246,7 @@ visor_flags = STOPSPRESSUREDMAGE /obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon_state() - icon_state = "hardsuit[on]-[item_color]" + icon_state = "hardsuit[on]-[base_icon_state]" /obj/item/clothing/head/helmet/space/hardsuit/syndi/Initialize(mapload) . = ..() @@ -316,7 +316,7 @@ alt_desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." icon_state = "hardsuit1-syndi" inhand_icon_state = "syndie_hardsuit" - item_color = "syndi" + base_icon_state = "syndi" origin_tech = "engineering=6;syndicate=4" w_class = WEIGHT_CLASS_NORMAL var/on = TRUE @@ -327,14 +327,14 @@ jetpack = /obj/item/tank/jetpack/suit /obj/item/clothing/suit/space/hardsuit/syndi/update_icon_state() - icon_state = "hardsuit[on]-[item_color]" + icon_state = "hardsuit[on]-[base_icon_state]" //Elite Syndie suit /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite name = "elite syndicate hardsuit helmet" desc = "An elite version of the syndicate helmet, with improved armour and fire shielding. It is in travel mode. Property of Gorlex Marauders." icon_state = "hardsuit0-syndielite" - item_color = "syndielite" + base_icon_state = "syndielite" armor = list(MELEE = 75, BULLET = 75, LASER = 50, ENERGY = 15, BOMB = 60, RAD = 115, FIRE = INFINITY, ACID = INFINITY) max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF @@ -343,7 +343,7 @@ name = "elite syndicate hardsuit" desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. It is in travel mode." icon_state = "hardsuit0-syndielite" - item_color = "syndielite" + base_icon_state = "syndielite" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite armor = list(MELEE = 75, BULLET = 75, LASER = 50, ENERGY = 15, BOMB = 60, RAD = 115, FIRE = INFINITY, ACID = INFINITY) max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT @@ -354,13 +354,13 @@ armor = list(MELEE = 115, BULLET = 115, LASER = 50, ENERGY = 35, BOMB = 200, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) //Almost as good as DS gear, but unlike DS can switch to combat for mobility flags_2 = RAD_PROTECT_CONTENTS_2 icon_state = "hardsuit0-sst" - item_color = "sst" + base_icon_state = "sst" /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst armor = list(MELEE = 115, BULLET = 115, LASER = 50, ENERGY = 40, BOMB = 200, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) flags_2 = RAD_PROTECT_CONTENTS_2 icon_state = "hardsuit0-sst" - item_color = "sst" + base_icon_state = "sst" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/sst /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst/Initialize(mapload) @@ -392,7 +392,7 @@ name = "\improper Soviet hardsuit helmet" desc = "A military hardsuit helmet bearing the red star of the U.S.S.P." icon_state = "hardsuit0-soviet" - item_color = "soviet" + base_icon_state = "soviet" armor = list(MELEE = 35, BULLET = 15, LASER = 30, ENERGY = 10, BOMB = 10, RAD = 50, FIRE = 75, ACID = 75) /obj/item/clothing/suit/space/hardsuit/soviet @@ -410,7 +410,7 @@ name = "\improper Soviet command hardsuit helmet" desc = "A military hardsuit helmet with a red command stripe." icon_state = "hardsuit0-soviet-commander" - item_color = "soviet-commander" + base_icon_state = "soviet-commander" /obj/item/clothing/suit/space/hardsuit/soviet/commander name = "\improper Soviet command hardsuit" @@ -423,7 +423,7 @@ name = "singuloth knight's helmet" desc = "This is an adamantium helmet from the chapter of the Singuloth Knights. It shines with a holy aura." icon_state = "hardsuit0-singuloth" - item_color = "singuloth" + base_icon_state = "singuloth" armor = list(MELEE = 35, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 15, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = null diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 99b9c022b2a..a048efa3f59 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -203,7 +203,7 @@ name = "battlemage helmet" desc = "A suitably impressive helmet." icon_state = "hardsuit0-wiz" - item_color = "wiz" + base_icon_state = "wiz" armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY) actions_types = list() //No inbuilt light resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 8e3fa199713..c55bcb0832f 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -3,19 +3,20 @@ desc = "If you see this contact a developer." icon = 'icons/obj/clothing/accessories.dmi' icon_state = "" - item_color = "" slot_flags = ITEM_SLOT_ACCESSORY var/slot = ACCESSORY_SLOT_DECOR /// the suit the accessory may be attached to var/obj/item/clothing/under/has_suit = null /// overlay used when attached to clothing. - var/image/inv_overlay = null + var/mutable_appearance/inv_overlay /// Allow accessories of the same type. var/allow_duplicates = TRUE + /// Icon state when attached to clothing, if null the `icon_state` value will be used + var/attached_icon_state /obj/item/clothing/accessory/Initialize(mapload) . = ..() - inv_overlay = image("icon" = 'icons/obj/clothing/accessories_overlay.dmi', "icon_state" = "[item_color? "[item_color]" : "[icon_state]"]") + inv_overlay = mutable_appearance('icons/obj/clothing/accessories_overlay.dmi', attached_icon_state || icon_state) /obj/item/clothing/accessory/Moved(atom/OldLoc, Dir, Forced) . = ..() @@ -118,7 +119,6 @@ name = "waistcoat" desc = "For some classy, murderous fun." icon_state = "waistcoat" - item_color = "waistcoat" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') //Medals @@ -126,7 +126,6 @@ name = "bronze medal" desc = "A bronze medal." icon_state = "bronze" - item_color = "bronze" materials = list(MAT_METAL=1000) resistance_flags = FIRE_PROOF /// The channel we will announce on when we are rewarded to someone @@ -158,7 +157,6 @@ name = "gold medal" desc = "A prestigious golden medal." icon_state = "gold" - item_color = "gold" materials = list(MAT_GOLD=1000) channel = "Common" @@ -183,7 +181,6 @@ name = "silver medal" desc = "A silver medal." icon_state = "silver" - item_color = "silver" materials = list(MAT_SILVER=1000) channel = "Command" @@ -245,7 +242,6 @@ name = "bronze heart medal" desc = "A rarely-awarded medal for those who sacrifice themselves in the line of duty to save their fellow crew." icon_state = "bronze_heart" - item_color = "bronze_heart" channel = "Common" // Plasma, from NT research departments. For now, used by the HRD-MDE project for the moderate 2 fauna, drake and hierophant. @@ -254,7 +250,6 @@ name = "plasma medal" desc = "An eccentric medal made of plasma." icon_state = "plasma" - item_color = "plasma" materials = list(MAT_PLASMA = 1000) cares_about_temperature = TRUE @@ -280,7 +275,6 @@ name = "alloy medal" desc = "An eccentric medal made of some strange alloy." icon_state = "alloy" - item_color = "alloy" materials = list(MAT_METAL = 500, MAT_PLASMA = 500) // Mostly mining medals past here @@ -332,14 +326,12 @@ name = "holobadge" desc = "This glowing blue badge marks the holder as THE LAW." icon_state = "holobadge" - item_color = "holobadge" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_ACCESSORY var/stored_name = null /obj/item/clothing/accessory/holobadge/cord icon_state = "holobadge-cord" - item_color = "holobadge-cord" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/neck.dmi', @@ -399,7 +391,6 @@ name = "magistrate's badge" desc = "Fills you with the conviction of JUSTICE. Display your mastery of Space Law to the world." icon_state = "legal_badge" - item_color = "legal_badge" var/cached_bubble_icon = null var/what_you_are = "THE LAW" @@ -437,7 +428,6 @@ name = "skull codpiece" desc = "A skull shaped ornament, intended to protect the important things in life." icon_state = "skull" - item_color = "skull" armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 10, RAD = 5, FIRE = 0, ACID = 15) allow_duplicates = FALSE @@ -445,7 +435,6 @@ name = "bone talisman" desc = "A hunter's talisman, some say the old gods smile on those who wear it." icon_state = "talisman" - item_color = "talisman" armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 10, RAD = 5, FIRE = 0, ACID = 15) allow_duplicates = FALSE @@ -454,70 +443,60 @@ name = "black cowboy shirt" desc = "For a real western look. Looks like it can clip on to a uniform." icon_state = "cowboyshirt" - item_color = "cowboyshirt" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/short_sleeved name = "shortsleeved black cowboy shirt" desc = "For when it's a hot day in the west. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_s" - item_color = "cowboyshirt_s" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/white name = "white cowboy shirt" desc = "For the rancher in us all. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_white" - item_color = "cowboyshirt_white" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/white/short_sleeved name = "short sleeved white cowboy shirt" desc = "Best for midday cattle tending. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_whites" - item_color = "cowboyshirt_whites" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/pink name = "pink cowboy shirt" desc = "For only the manliest of men, or girliest of girls. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_pink" - item_color = "cowboyshirt_pink" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved name = "short sleeved pink cowboy shirt" desc = "For a real buckle bunny. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_pinks" - item_color = "cowboyshirt_pinks" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/navy name = "navy cowboy shirt" desc = "Now yer a real cowboy. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_navy" - item_color = "cowboyshirt_navy" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved name = "short sleeved navy cowboy shirt" desc = "Sometimes ya need to roll up your sleeves. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_navys" - item_color = "cowboyshirt_navys" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/red name = "red cowboy shirt" desc = "It's high noon. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_red" - item_color = "cowboyshirt_red" sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') /obj/item/clothing/accessory/cowboyshirt/red/short_sleeved name = "short sleeved red cowboy shirt" desc = "Life on the open range is quite dangeorus, you never know what to expect. Looks like it can clip on to a uniform." icon_state = "cowboyshirt_reds" - item_color = "cowboyshirt_reds" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', @@ -529,32 +508,27 @@ desc = "A black corset for those fancy nights out." icon_state = "corset" inhand_icon_state = "corset" - item_color = "corset" /obj/item/clothing/accessory/corset/red name = "red corset" desc = "A red corset those fancy nights out." icon_state = "corset_red" - item_color = "corset_red" /obj/item/clothing/accessory/corset/blue name = "blue corset" desc = "A blue corset for those fancy nights out." icon_state = "corset_blue" - item_color = "corset_blue" //Pins /obj/item/clothing/accessory/pin name = "nanotrasen pin" desc = "It's a standard pin to wear so you can show your loyalty to Nanotrasen!" icon_state = "nt_pin" - item_color = "nt_pin" /obj/item/clothing/accessory/pin/pride name = "pride pin" desc = "It's a standard pin, wear it with pride. You can change which flag is used from a button on the back." icon_state = "pride_pin" - item_color = "pride_pin" ///List of all pride flags to icon state var/static/list/flag_types = list( @@ -587,8 +561,7 @@ to_chat(user, "You change [src] to show [chosen_pin].") icon_state = pin_icon_state - item_color = pin_icon_state - inv_overlay = image("icon" = 'icons/obj/clothing/accessories_overlay.dmi', "icon_state" = "[item_color? "[item_color]" : "[icon_state]"]") + inv_overlay = mutable_appearance('icons/obj/clothing/accessories_overlay.dmi', icon_state) /proc/english_accessory_list(obj/item/clothing/under/U) if(!istype(U) || !length(U.accessories)) diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 739b23e9605..3e3d939615d 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -2,65 +2,54 @@ name = "red armband" desc = "A fancy red armband!" icon_state = "red" - item_color = "red" slot = ACCESSORY_SLOT_ARMBAND /obj/item/clothing/accessory/armband/sec name = "security armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and red." icon_state = "whitered" - item_color = "whitered" /obj/item/clothing/accessory/armband/yb name = "blue-yellow armband" desc = "A fancy blue and yellow armband!" icon_state = "solblue" - item_color = "solblue" /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 with a black strip." 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" /obj/item/clothing/accessory/armband/procedure name = "procedure armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is lavender." icon_state = "procedure" - item_color = "procedure" /obj/item/clothing/accessory/armband/service name = "service armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is mint green." icon_state = "service" - item_color = "service" diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 1693a3ecd5d..396e888fab1 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 = ACCESSORY_SLOT_UTILITY var/list/holster_allow = list(/obj/item/gun) var/obj/item/gun/holstered = null @@ -115,4 +114,5 @@ /obj/item/clothing/accessory/holster/waist desc = "A handgun holster. Made of expensive leather." - item_color = "holster_low" + worn_icon_state = "holster_low" + attached_icon_state = "holster_low" diff --git a/code/modules/clothing/under/accessories/storage_accessories.dm b/code/modules/clothing/under/accessories/storage_accessories.dm index 28142b8d0bb..5f705a5dda4 100644 --- a/code/modules/clothing/under/accessories/storage_accessories.dm +++ b/code/modules/clothing/under/accessories/storage_accessories.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 = ACCESSORY_SLOT_UTILITY var/slots = 3 var/obj/item/storage/internal/hold @@ -85,21 +84,18 @@ 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/Initialize(mapload) diff --git a/code/modules/clothing/under/centcom.dm b/code/modules/clothing/under/centcom.dm index 36381eedf0a..faec16a84bb 100644 --- a/code/modules/clothing/under/centcom.dm +++ b/code/modules/clothing/under/centcom.dm @@ -5,7 +5,6 @@ icon_state = "officer" worn_icon = 'icons/mob/clothing/under/centcom.dmi' inhand_icon_state = "g_suit" - item_color = "officer" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/centcom.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/centcom.dmi', @@ -23,49 +22,42 @@ desc = "It's decorative jumpsuit worn by the Deathsquad. A small tag at the bottom reads \"Not associated with Nanotrasen\". " icon_state = "deathsquad" inhand_icon_state = "bl_suit" - item_color = "deathsquad" random_sensor = FALSE /obj/item/clothing/under/rank/centcom/ert/chaplain name = "response team chaplain uniform" desc = "An armoured uniform designed for emergency response teams. This one belongs to a chaplain." icon_state = "ert_chaplain" - item_color = "ert_chaplain" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/ert/commander name = "response team commander uniform" desc = "An armoured uniform designed for emergency response teams. This one belongs to the command officer." icon_state = "ert_commander" - item_color = "ert_commander" armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/ert/engineer name = "response team engineer uniform" desc = "An armoured uniform designed for emergency response teams. This one belongs to an engineer." icon_state = "ert_engineer" - item_color = "ert_engineer" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/ert/janitor name = "response team janitor uniform" desc = "An armoured uniform designed for emergency response teams. This one belongs to a janitor." icon_state = "ert_janitor" - item_color = "ert_janitor" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/ert/medical name = "response team medic uniform" desc = "An armoured uniform designed for emergency response teams. This one belongs to a medic." icon_state = "ert_medic" - item_color = "ert_medic" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/ert/security name = "response team security uniform" desc = "An armoured uniform designed for emergency response teams. This one belongs to a security officer." icon_state = "ert_security" - item_color = "ert_security" armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/centcom/commander @@ -73,14 +65,12 @@ desc = "It's a jumpsuit worn by CentComm's highest-tier Commanders." icon_state = "centcom" inhand_icon_state = "dg_suit" - item_color = "centcom" /obj/item/clothing/under/rank/centcom/officer name = "\improper Nanotrasen naval officer's uniform" desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant-Commander\" and bears \"N.A.S. Trurl \" on the left shoulder. Worn exclusively by officers of the Nanotrasen Navy. It's got exotic materials for protection." icon_state = "navy_gold" inhand_icon_state = null - item_color = "navy_gold" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) displays_id = FALSE @@ -89,7 +79,6 @@ desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain\" and bears \"N.A.S. Trurl \" on the left shoulder. Worn exclusively by officers of the Nanotrasen Navy. It's got exotic materials for protection." icon_state = "navy_gold" inhand_icon_state = null - item_color = "navy_gold" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) displays_id = FALSE @@ -101,5 +90,4 @@ name = "\improper Nanotrasen diplomatic uniform" desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps." icon_state = "presidente" - item_color = "presidente" displays_id = FALSE diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index fa2bb5b127e..479aa91d242 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -28,33 +28,28 @@ name = initial(C.name) icon_state = initial(C.icon_state) inhand_icon_state = initial(C.inhand_icon_state) - item_color = initial(C.item_color) /obj/item/clothing/under/color/black name = "black jumpsuit" icon_state = "black" inhand_icon_state = "bl_suit" - item_color = "black" resistance_flags = NONE /obj/item/clothing/under/color/jumpskirt/black name = "black jumpskirt" - icon_state = "blackjumpskirt" + icon_state = "blackskirt" inhand_icon_state = "bl_suit" - item_color = "blackskirt" resistance_flags = NONE // I am going to assume this is here for a reason /obj/item/clothing/under/color/blue name = "blue jumpsuit" icon_state = "blue" inhand_icon_state = "b_suit" - item_color = "blue" /obj/item/clothing/under/color/jumpskirt/blue name = "blue jumpskirt" - icon_state = "bluejumpskirt" + icon_state = "blueskirt" inhand_icon_state = "b_suit" - item_color = "blueskirt" /obj/item/clothing/under/color/blue/dodgeball flags = NODROP @@ -63,20 +58,17 @@ name = "green jumpsuit" icon_state = "green" inhand_icon_state = "g_suit" - item_color = "green" /obj/item/clothing/under/color/jumpskirt/green name = "green jumpskirt" - icon_state = "greenjumpskirt" + icon_state = "greenskirt" inhand_icon_state = "g_suit" - item_color = "greenskirt" /obj/item/clothing/under/color/grey name = "grey jumpsuit" desc = "A tasteful grey jumpsuit that reminds you of the good old days." icon_state = "grey" inhand_icon_state = "gy_suit" - item_color = "grey" /obj/item/clothing/under/color/grey/greytide flags = NODROP @@ -84,43 +76,37 @@ /obj/item/clothing/under/color/jumpskirt/grey name = "grey jumpskirt" desc = "A tasteful grey jumpskirt that reminds you of the good old days." - icon_state = "greyjumpskirt" + icon_state = "greyskirt" inhand_icon_state = "gy_suit" - item_color = "greyskirt" /obj/item/clothing/under/color/grey/glorf name = "ancient jumpsuit" desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade." icon_state = "ancient" - item_color = "ancient" /obj/item/clothing/under/color/orange name = "orange jumpsuit" desc = "Don't wear this near paranoid security officers." icon_state = "orange" inhand_icon_state = "o_suit" - item_color = "orange" /obj/item/clothing/under/color/jumpskirt/orange name = "orange jumpskirt" desc = "Don't wear this near paranoid security officers." - icon_state = "orangejumpskirt" + icon_state = "orangeskirt" inhand_icon_state = "o_suit" - item_color = "orangeskirt" /obj/item/clothing/under/color/orange/prison desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "prisoner" inhand_icon_state = "prisoner" - item_color = "prisoner" has_sensor = 2 sensor_mode = SENSOR_COORDS /obj/item/clothing/under/color/jumpskirt/orange/prison desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." - icon_state = "prisonerjumpskirt" + icon_state = "prisonerskirt" inhand_icon_state = "prisoner" - item_color = "prisonerskirt" has_sensor = 2 sensor_mode = SENSOR_COORDS @@ -129,26 +115,22 @@ desc = "Just looking at this makes you feel fabulous." icon_state = "pink" inhand_icon_state = "p_suit" - item_color = "pink" /obj/item/clothing/under/color/jumpskirt/pink name = "pink jumpskirt" desc = "Just looking at this makes you feel fabulous." - icon_state = "pinkjumpskirt" + icon_state = "pinkskirt" inhand_icon_state = "p_suit" - item_color = "pinkskirt" /obj/item/clothing/under/color/red name = "red jumpsuit" icon_state = "red" inhand_icon_state = "r_suit" - item_color = "red" /obj/item/clothing/under/color/jumpskirt/red name = "red jumpskirt" - icon_state = "redjumpskirt" + icon_state = "redskirt" inhand_icon_state = "r_suit" - item_color = "redskirt" /obj/item/clothing/under/color/red/dodgeball flags = NODROP @@ -156,60 +138,49 @@ /obj/item/clothing/under/color/white name = "white jumpsuit" icon_state = "white" - item_color = "white" /obj/item/clothing/under/color/jumpskirt/white name = "white jumpskirt" - icon_state = "whitejumpskirt" - item_color = "whiteskirt" + icon_state = "whiteskirt" /obj/item/clothing/under/color/yellow name = "yellow jumpsuit" icon_state = "yellow" - item_color = "yellow" /obj/item/clothing/under/color/jumpskirt/yellow name = "yellow jumpskirt" - icon_state = "yellowjumpskirt" - item_color = "yellowskirt" + icon_state = "yellowskirt" /obj/item/clothing/under/color/psyche name = "psychedelic jumpsuit" desc = "Groovy!" icon_state = "psyche" - item_color = "psyche" /obj/item/clothing/under/color/lightblue name = "light blue jumpsuit" icon_state = "lightblue" - item_color = "lightblue" /obj/item/clothing/under/color/jumpskirt/lightblue name = "light blue jumpskirt" - icon_state = "lightbluejumpskirt" - item_color = "lightblueskirt" + icon_state = "lightblueskirt" /obj/item/clothing/under/color/aqua name = "aqua jumpsuit" icon_state = "aqua" - item_color = "aqua" /obj/item/clothing/under/color/jumpskirt/aqua name = "aqua jumpskirt" - icon_state = "aquajumpskirt" - item_color = "aquaskirt" + icon_state = "aquaskirt" /obj/item/clothing/under/color/purple name = "purple jumpsuit" icon_state = "purple" inhand_icon_state = "p_suit" - item_color = "purple" /obj/item/clothing/under/color/jumpskirt/purple name = "purple jumpskirt" - icon_state = "purplejumpskirt" + icon_state = "purpleskirt" inhand_icon_state = "p_suit" - item_color = "purpleskirt" /// for jani ert /obj/item/clothing/under/color/purple/sensor @@ -219,105 +190,85 @@ /obj/item/clothing/under/color/lightpurple name = "light purple jumpsuit" icon_state = "lightpurple" - item_color = "lightpurple" /obj/item/clothing/under/color/jumpskirt/lightpurple name = "light purple jumpskirt" - icon_state = "lightpurplejumpskirt" - item_color = "lightpurpleskirt" + icon_state = "lightpurpleskirt" /obj/item/clothing/under/color/lightgreen name = "light green jumpsuit" icon_state = "lightgreen" - item_color = "lightgreen" /obj/item/clothing/under/color/jumpskirt/lightgreen name = "light green jumpskirt" - icon_state = "lightgreenjumpskirt" - item_color = "lightgreenskirt" + icon_state = "lightgreenskirt" /obj/item/clothing/under/color/lightbrown name = "light brown jumpsuit" icon_state = "lightbrown" - item_color = "lightbrown" /obj/item/clothing/under/color/jumpskirt/lightbrown name = "light brown jumpskirt" - icon_state = "lightbrownjumpskirt" - item_color = "lightbrownskirt" + icon_state = "lightbrownskirt" /obj/item/clothing/under/color/brown name = "brown jumpsuit" icon_state = "brown" - item_color = "brown" /obj/item/clothing/under/color/jumpskirt/brown name = "brown jumpskirt" - icon_state = "brownjumpskirt" - item_color = "brownskirt" + icon_state = "brownskirt" /obj/item/clothing/under/color/yellowgreen name = "yellow green jumpsuit" icon_state = "yellowgreen" - item_color = "yellowgreen" /obj/item/clothing/under/color/jumpskirt/yellowgreen name = "yellow green jumpskirt" - icon_state = "yellowgreenjumpskirt" - item_color = "yellowgreenskirt" + icon_state = "yellowgreenskirt" /obj/item/clothing/under/color/darkblue name = "dark blue jumpsuit" icon_state = "darkblue" - item_color = "darkblue" /obj/item/clothing/under/color/jumpskirt/darkblue name = "dark blue jumpskirt" - icon_state = "darkbluejumpskirt" - item_color = "darkblueskirt" + icon_state = "darkblueskirt" /obj/item/clothing/under/color/lightred name = "light red jumpsuit" icon_state = "lightred" - item_color = "lightred" /obj/item/clothing/under/color/jumpskirt/lightred name = "light red jumpskirt" - icon_state = "lightredjumpskirt" - item_color = "lightredskirt" + icon_state = "lightredskirt" /obj/item/clothing/under/color/darkred name = "dark red jumpsuit" icon_state = "darkred" - item_color = "darkred" /obj/item/clothing/under/color/jumpskirt/darkred name = "dark red jumpskirt" - icon_state = "darkredjumpskirt" - item_color = "darkredskirt" + icon_state = "darkredskirt" /obj/item/clothing/under/color/rainbow name = "rainbow" desc = "rainbow." icon_state = "rainbow" inhand_icon_state = "rainbow" - item_color = "rainbow" /obj/item/clothing/under/color/jumpskirt/rainbow name = "rainbow jumpskirt" desc = "Rainbow." - icon_state = "rainbowjumpskirt" + icon_state = "rainbowskirt" inhand_icon_state = "rainbow" - item_color = "rainbowskirt" /obj/item/clothing/under/color/red/jersey name = "red team jersey" desc = "The jersey of the Nanotrasen Phi-ghters!" icon_state = "redjersey" - item_color = "redjersey" /obj/item/clothing/under/color/blue/jersey name = "blue team jersey" desc = "The jersey of the Nanotrasen Pi-rates!" icon_state = "bluejersey" - item_color = "bluejersey" diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm index 04fdb021c49..05ac272d273 100644 --- a/code/modules/clothing/under/costumes.dm +++ b/code/modules/clothing/under/costumes.dm @@ -11,25 +11,21 @@ name = "rogue captains uniform" desc = "For the man who doesn't care because he's still free." icon_state = "captain_fly" - item_color = "captain_fly" /obj/item/clothing/under/costume/patriotsuit name = "Patriotic Suit" desc = "Motorcycle not included." icon_state = "ek" - item_color = "ek" /obj/item/clothing/under/costume/flappers name = "flappers" desc = "Nothing like the roarin' '20s, flapping the night away on the dance floor." icon_state = "flapper" - item_color = "flapper" /obj/item/clothing/under/costume/gladiator name = "gladiator uniform" desc = "Are you not entertained? Is that not why you are here?" icon_state = "gladiator" - item_color = "gladiator" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS resistance_flags = NONE @@ -41,84 +37,71 @@ name = "griffon uniform" desc = "A soft brown jumpsuit with a white feather collar made of synthetic feathers and a lust for mayhem." icon_state = "griffin" - item_color = "griffin" /obj/item/clothing/under/costume/owl name = "owl uniform" desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction." icon_state = "owl" - item_color = "owl" /obj/item/clothing/under/costume/janimaid name = "maid uniform" desc = "A simple maid uniform for housekeeping." icon_state = "janimaid" - item_color = "janimaid" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/costume/jester name = "jester suit" desc = "A jolly dress, well suited to entertain your master, nuncle." icon_state = "jester" - item_color = "jester" /obj/item/clothing/under/costume/mankini name = "the mankini" desc = "No honest man would wear this abomination." icon_state = "mankini" - item_color = "mankini" /obj/item/clothing/under/costume/maid name = "maid costume" desc = "Maid in China." icon_state = "meido" - item_color = "meido" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/costume/noble_clothes name = "noble clothes" desc = "They fall just short of majestic." icon_state = "noble_clothes" - item_color = "noble_clothes" /obj/item/clothing/under/costume/officeruniform name = "clown officer's uniform" desc = "For the officers of the Clown army." icon_state = "officeruniform" - item_color = "officeruniform" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/costume/soldieruniform name = "clown soldier's uniform" desc = "For the basic grunt of the Clown army." icon_state = "soldieruniform" - item_color = "soldieruniform" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/costume/pennywise name = "\improper Pennywise costume" desc = "It's everything you ever were afraid of." icon_state = "pennywise" - item_color = "pennywise" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/costume/pirate name = "pirate outfit" desc = "Yarr." icon_state = "pirate" - item_color = "pirate" /obj/item/clothing/under/costume/pirate_rags name = "pirate rags" desc = "an old ragged set of clothing." icon_state = "piraterags" - item_color = "piraterags" /obj/item/clothing/under/costume/psyjump name = "psychic amp jumpsuit" desc = "A suit made of strange materials." icon_state = "psyamp" - item_color = "psyamp" /// Don't modify the path, used by a fluff item /obj/item/clothing/under/psysuit @@ -127,7 +110,6 @@ icon = 'icons/obj/clothing/under/costumes.dmi' icon_state = "psysuit" worn_icon = 'icons/mob/clothing/under/costumes.dmi' - item_color = "psysuit" //it is what it is sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/costumes.dmi', @@ -139,14 +121,12 @@ name = "redcoat uniform" desc = "Looks old." icon_state = "redcoat" - item_color = "redcoat" /obj/item/clothing/under/costume/roman name = "roman armor" desc = "An ancient Roman armor. Made of metallic strips and leather straps." icon_state = "roman" inhand_icon_state = "armor" - item_color = "roman" strip_delay = 100 resistance_flags = NONE @@ -154,35 +134,29 @@ name = "old soviet uniform" desc = "For the Motherland!" icon_state = "soviet" - item_color = "soviet" /obj/item/clothing/under/costume/tourist_suit name = "tourist outfit" desc = "A light blue shirt with brown shorts. Feels oddly spooky." icon_state = "tourist" - item_color = "tourist" /obj/item/clothing/under/costume/singery name = "yellow performer's outfit" desc = "Just looking at this makes you want to sing." icon_state = "ysing" - item_color = "ysing" /obj/item/clothing/under/costume/singerb name = "blue performer's outfit" desc = "Just looking at this makes you want to sing." icon_state = "bsing" - item_color = "bsing" /obj/item/clothing/under/costume/cuban_suit name = "rhumba outfit" desc = "A satin shirt and high-waisted pants, worn by dancers in the Rhumba style. It smells oddly like... sulfur?" icon_state = "cuban_suit" - item_color = "cuban_suit" /obj/item/clothing/under/costume/kilt name = "kilt" desc = "Includes shoes and plaid." icon_state = "kilt" - item_color = "kilt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET diff --git a/code/modules/clothing/under/dress.dm b/code/modules/clothing/under/dress.dm index b0b7bfe8c8b..f00ebe46398 100644 --- a/code/modules/clothing/under/dress.dm +++ b/code/modules/clothing/under/dress.dm @@ -11,30 +11,25 @@ name = "black victorian dress" desc = "A victorian style dress, fancy!" icon_state = "victorianblackdress" - item_color = "victorianblackdress" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/dress/victdress/red name = "red victorian dress" icon_state = "victorianreddress" - item_color = "victorianreddress" /obj/item/clothing/under/dress/blacktango name = "black tango dress" desc = "Filled with Latin fire." icon_state = "black_tango" - item_color = "black_tango" /obj/item/clothing/under/dress/blacktango/blue name = "blue tango dress" icon_state = "blue_tango" - item_color = "blue_tango" /obj/item/clothing/under/dress/blackskirt name = "black skirt" desc = "A black skirt, very fancy!" icon_state = "blackskirt" - item_color = "blackskirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -45,84 +40,71 @@ name = "orange wedding dress" desc = "A big and puffy orange dress." icon_state = "bride_orange" - item_color = "bride_orange" flags_inv = HIDESHOES /obj/item/clothing/under/dress/wedding/bride_purple name = "purple wedding dress" desc = "A big and puffy purple dress." icon_state = "bride_purple" - item_color = "bride_purple" flags_inv = HIDESHOES /obj/item/clothing/under/dress/wedding/bride_blue name = "blue wedding dress" desc = "A big and puffy blue dress." icon_state = "bride_blue" - item_color = "bride_blue" flags_inv = HIDESHOES /obj/item/clothing/under/dress/wedding/bride_red name = "red wedding dress" desc = "A big and puffy red dress." icon_state = "bride_red" - item_color = "bride_red" flags_inv = HIDESHOES /obj/item/clothing/under/dress/wedding/bride_white name = "white wedding dress" desc = "A white wedding gown made from the finest silk." icon_state = "bride_white" - item_color = "bride_white" flags_inv = HIDESHOES /obj/item/clothing/under/dress/dress_fire name = "flame dress" desc = "A small black dress with blue flames print on it." icon_state = "dress_fire" - item_color = "dress_fire" /obj/item/clothing/under/dress/dress_orange name = "orange dress" desc = "A fancy orange gown for those who like to show leg." icon_state = "dress_orange" - item_color = "dress_orange" /obj/item/clothing/under/dress/dress_pink name = "pink dress" desc = "A simple, tight fitting pink dress." icon_state = "dress_pink" - item_color = "dress_pink" /obj/item/clothing/under/dress/dress_green name = "green dress" desc = "A simple, tight fitting green dress." icon_state = "dress_green" - item_color = "dress_green" /obj/item/clothing/under/dress/dress_yellow name = "yellow dress" desc = "A flirty, little yellow dress." icon_state = "dress_yellow" - item_color = "dress_yellow" /obj/item/clothing/under/dress/dress_saloon name = "saloon girl dress" desc = "A old western inspired gown for the girl who likes to drink." icon_state = "dress_saloon" - item_color = "dress_saloon" /obj/item/clothing/under/dress/plaid_blue name = "blue plaid skirt" desc = "A preppy blue skirt with a white blouse." icon_state = "plaid_blue" - item_color = "plaid_blue" /obj/item/clothing/under/dress/plaid_red name = "red plaid skirt" desc = "A preppy red skirt with a white blouse." icon_state = "plaid_red" - item_color = "plaid_red" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -130,7 +112,6 @@ name = "blue purple skirt" desc = "A preppy purple skirt with a white blouse." icon_state = "plaid_purple" - item_color = "plaid_purple" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -138,30 +119,25 @@ name = "sailor dress" desc = "Formal wear for a leading lady." icon_state = "sailor_dress" - item_color = "sailor_dress" /obj/item/clothing/under/dress/redeveninggown name = "red evening gown" desc = "Fancy dress for space bar singers." icon_state = "red_evening_gown" - item_color = "red_evening_gown" /obj/item/clothing/under/dress/schoolgirl name = "schoolgirl uniform" desc = "It's just like one of my Japanese animes!" icon_state = "schoolgirl" - item_color = "schoolgirl" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/dress/stripeddress name = "striped dress" desc = "Fashion in space." icon_state = "striped_dress" - item_color = "striped_dress" /obj/item/clothing/under/dress/sundress name = "sundress" desc = "Makes you want to frolic in a field of daisies." icon_state = "sundress" - item_color = "sundress" body_parts_covered = UPPER_TORSO|LOWER_TORSO diff --git a/code/modules/clothing/under/jobs/captain.dm b/code/modules/clothing/under/jobs/captain.dm index 124b7bbb9ff..20da7b483d0 100644 --- a/code/modules/clothing/under/jobs/captain.dm +++ b/code/modules/clothing/under/jobs/captain.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/clothing/under/captain.dmi' icon_state = "captain" worn_icon = 'icons/mob/clothing/under/captain.dmi' - item_color = "captain" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/captain.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/captain.dmi', @@ -16,23 +15,19 @@ name = "captain's skirt" desc = "It's a blue dress shirt and black skirt with some gold markings denoting the rank of \"Captain\"." icon_state = "captain_skirt" - item_color = "captain_skirt" /obj/item/clothing/under/rank/captain/white desc = "It's a white dress shirt and black slacks with some gold markings denoting the rank of \"Captain\"." icon_state = "captain_white" - item_color = "captain_white" /obj/item/clothing/under/rank/captain/skirt/white desc = "It's a white dress shirt and black skirt with some gold markings denoting the rank of \"Captain\"." icon_state = "captain_skirt_white" - item_color = "captain_skirt_white" /obj/item/clothing/under/rank/captain/dress name = "captain's dress" desc = "Feminine fashion for the style conscious captain." icon_state = "captain_dress" - item_color = "captain_dress" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -40,4 +35,3 @@ name = "captain's parade uniform" desc = "A captain's luxury-wear, for special occasions." icon_state = "captain_parade" - item_color = "captain_parade" diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index 1968a3e9dcf..8faf419c996 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -12,13 +12,11 @@ name = "quartermaster's uniform" desc = "It's a brown dress shirt and black slacks worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." icon_state = "qm" - item_color = "qm" /obj/item/clothing/under/rank/cargo/qm/skirt name = "quartermaster's skirt" desc = "It's a brown dress shirt and black skirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." icon_state = "qm_skirt" - item_color = "qm_skirt" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -26,115 +24,96 @@ name = "quartermaster's dress" desc = "An elegant dress for the style conscious quartermaster." icon_state = "qm_dress" - item_color = "qm_dress" /obj/item/clothing/under/rank/cargo/qm/formal name = "quartermaster's formal uniform" desc = "A pinstripe suit historically worn by schemers. Perfect for the quartermaster!" icon_state = "qm_formal" - item_color = "qm_formal" /obj/item/clothing/under/rank/cargo/qm/whimsy name = "quartermaster's sweater" desc = "A snazzy brown sweater vest and black tie. Warms the core in the cold warehouse." icon_state = "qm_whimsy" - item_color = "qm_whimsy" /obj/item/clothing/under/rank/cargo/qm/turtleneck name = "quartermaster's turtleneck" desc = "A fancy turtleneck designed to keep the wearer cozy in a cold cargo bay. Due to budget cuts, the material does not offer any external protection." icon_state = "qm_turtle" - item_color = "qm_turtle" /obj/item/clothing/under/rank/cargo/tech name = "cargo technician's jumpsuit" desc = "A standard issue jumpsuit for cargo technicians. Snazzy!" icon_state = "cargo" - item_color = "cargo" /obj/item/clothing/under/rank/cargo/tech/skirt name = "cargo technician's jumpskirt" desc = "A standard issue jumpskirt for cargo technicians. Jazzy!" icon_state = "cargo_skirt" - item_color = "cargo_skirt" /obj/item/clothing/under/rank/cargo/tech/overalls name = "cargo technician's overalls" desc = "Protective overalls to keep spills from the warehouse off your legs." icon_state = "cargo_overalls" - item_color = "cargo_overalls" /obj/item/clothing/under/rank/cargo/tech/delivery name = "delivery uniform" desc = "It's a jumpsuit worn by the cargo delivery crew." icon_state = "delivery" - item_color = "delivery" /obj/item/clothing/under/rank/cargo/miner name = "shaft miner's jumpsuit" desc = "It's an outdated jumpsuit, designed specifically to withstand the harsh conditions of Lavaland. It is very dirty." icon_state = "miner" - item_color = "miner" /obj/item/clothing/under/rank/cargo/miner/skirt name = "shaft miner's jumpskirt" desc = "It's an outdated jumpskirt, designed specifically to withstand the harsh conditions of Lavaland while remaining pretty. It is very dirty." icon_state = "miner_skirt" - item_color = "miner_skirt" /obj/item/clothing/under/rank/cargo/miner/lavaland name = "shaft miner's harshsuit" desc = "It's an brown uniform with some padded armour for operating in hazardous environments." armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) icon_state = "explorer" - item_color = "explorer" /obj/item/clothing/under/rank/cargo/miner/lavaland/skirt name = "shaft miner's harshskirt" desc = "It's an brown uniform with some padded armour for operating in hazardous environments while remaining pretty." icon_state = "explorer_skirt" - item_color = "explorer_skirt" /obj/item/clothing/under/rank/cargo/miner/lavaland/overalls name = "shaft miner's overalls" desc = "It's an dark purple turtleneck with a sturdy set of overalls. Sadly, doesn't have any extra pockets to carry some sandwiches. It is very dirty." icon_state = "explorer_overalls" - item_color = "explorer_overalls" /obj/item/clothing/under/rank/cargo/expedition name = "expedition jumpsuit" desc = "An armored brown jumpsuit with Nanotrasen markings for identification, and a black safety harness for their space suits." armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) icon_state = "expedition" - item_color = "expedition" /obj/item/clothing/under/rank/cargo/expedition/skirt name = "expedition jumpskirt" desc = "An armoured brown jumpskirt with Nanotrasen markings for identification, and a black safety harness for their space suits." icon_state = "expedition_skirt" - item_color = "expedition_skirt" /obj/item/clothing/under/rank/cargo/expedition/overalls name = "expedition overalls" desc = "A brown set of overalls over a blue turtleneck, designed to protect the wearer from microscopic space debris. Does not protect against larger objects." icon_state = "expedition_overalls" - item_color = "expedition_overalls" /obj/item/clothing/under/rank/cargo/smith name = "smith's jumpsuit" desc = "A brown jumpsuit with some extra metal pieces strapped to it. You're not sure why, but the added armor doesn't make you feel any safer..." armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) icon_state = "smith" - item_color = "smith" /obj/item/clothing/under/rank/cargo/smith/skirt name = "smith's jumpskirt" desc = "A brown jumpskirt with some extra metal pieces strapped to it. You're not sure why, but the added armor doesn't make you feel any safer..." icon_state = "smith_skirt" - item_color = "smith_skirt" /obj/item/clothing/under/rank/cargo/smith/overalls name = "smith's overalls" desc = "A brown set of overalls over a black turtleneck, designed with thinner materials to keep the wearer cool in the heat of the forge." icon_state = "smith_overalls" - item_color = "smith_overalls" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 5d4bab9b37b..56807821562 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -12,13 +12,11 @@ name = "head of personnel's uniform" desc = "It's a blue dress shirt and black slacks worn by someone who works in the position of \"Head of Personnel\"." icon_state = "hop" - item_color = "hop" /obj/item/clothing/under/rank/civilian/hop/skirt name = "head of personnel's skirt" desc = "It's a blue dress shirt and black skirt worn by someone who works in the position of \"Head of Personnel\"." icon_state = "hop_skirt" - item_color = "hop_skirt" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -26,44 +24,37 @@ name = "head of personnel's dress" desc = "Feminine fashion for the style conscious Head of Personnel." icon_state = "hop_dress" - item_color = "hop_dress" /obj/item/clothing/under/rank/civilian/hop/formal name = "head of personnel's formal uniform" desc = "A stylish choice for a formal occasion." icon_state = "hop_formal" - item_color = "hop_formal" /obj/item/clothing/under/rank/civilian/hop/whimsy name = "head of personnel's suit" desc = "A blue sweater and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does." icon_state = "hop_whimsy" - item_color = "hop_whimsy" /obj/item/clothing/under/rank/civilian/hop/oldman name = "old man's suit" desc = "A classic suit for the older gentleman with built in back support." icon_state = "oldman" - item_color = "oldman" /obj/item/clothing/under/rank/civilian/hop/turtleneck name = "head of personnel's turtleneck" desc = "A fancy turtleneck designed to keep the wearer cozy in a cold office. Due to budget cuts, the material does not offer any external protection." icon_state = "hop_turtle" - item_color = "hop_turtle" /obj/item/clothing/under/rank/civilian/bartender desc = "It looks like it could use some more flair." name = "bartender's uniform" icon_state = "ba_suit" inhand_icon_state = null - item_color = "ba_suit" /obj/item/clothing/under/rank/civilian/chaplain desc = "It's a black jumpsuit, often worn by religious folk." name = "chaplain's jumpsuit" icon_state = "chaplain" - item_color = "chapblack" /obj/item/clothing/under/rank/civilian/chaplain/sensor sensor_mode = SENSOR_COORDS @@ -73,14 +64,12 @@ desc = "It's an apron which is given only to the most hardcore chefs in space." name = "chef's uniform" icon_state = "chef" - item_color = "chef" /obj/item/clothing/under/rank/civilian/clown name = "clown suit" desc = "'HONK!'" icon_state = "clown" inhand_icon_state = "clown" - item_color = "clown" /obj/item/clothing/under/rank/civilian/clown/Initialize(mapload) . = ..() @@ -96,13 +85,11 @@ /obj/item/clothing/under/rank/civilian/clown/skirt name = "clown skirt" icon_state = "clown_skirt" - item_color = "clown_skirt" /obj/item/clothing/under/rank/civilian/clown/sexy name = "sexy-clown suit" desc = "It makes you want to practice clown law." icon_state = "sexyclown" - item_color = "sexyclown" /obj/item/clothing/under/rank/civilian/clown/nodrop flags = NODROP @@ -111,12 +98,10 @@ name = "mime's outfit" desc = "It's not very colourful." icon_state = "mime" - item_color = "mime" /obj/item/clothing/under/rank/civilian/mime/skirt name = "mime's skirt" icon_state = "mime_skirt" - item_color = "mime_skirt" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -124,7 +109,6 @@ name = "sexy mime outfit" desc = "The only time when you DON'T enjoy looking at someone's rack." icon_state = "sexymime" - item_color = "sexymime" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/rank/civilian/hydroponics @@ -132,39 +116,33 @@ name = "botanist's jumpsuit" icon_state = "hydroponics" inhand_icon_state = "g_suit" - item_color = "hydroponics" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/civilian/hydroponics/alt desc = "It's a jumpsuit designed to protect against minor plant-related hazards. This one has brown markings." name = "hydroponicist's jumpsuit" icon_state = "hydroponics_alt" - item_color = "hydroponics_alt" /obj/item/clothing/under/rank/civilian/janitor name = "janitor's jumpsuit" desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." icon_state = "janitor" inhand_icon_state = "janitor" - item_color = "janitor" /obj/item/clothing/under/rank/civilian/janitor/skirt name = "janitor's jumpskirt" desc = "It's the official skirt variant of the janitor's uniform. It has leggings for protection against messes." icon_state = "janitor_skirt" - item_color = "janitor_skirt" /obj/item/clothing/under/rank/civilian/janitor/overalls name = "janitor's overalls" desc = "Protective overalls designed to protect the wearer against large amounts of viscera." icon_state = "janitor_overalls" - item_color = "janitor_overalls" /obj/item/clothing/under/rank/civilian/librarian name = "librarian's uniform" desc = "A collared shirt with dapper pinstripe pants guaranteed to make you stand out at any Halloween party." icon_state = "red_suit" - item_color = "red_suit" /obj/item/clothing/under/rank/civilian/mime/nodrop flags = NODROP @@ -173,4 +151,3 @@ desc = "It's a barber's uniform." name = "barber's uniform" icon_state = "barber" - item_color = "barber" diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm index 9c722623f1e..42fee328a26 100644 --- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm @@ -13,7 +13,6 @@ name = "chief engineer's uniform" desc = "It's a yellow dress shirt and black slacks given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." icon_state = "ce" - item_color = "ce" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 200, ACID = 35) resistance_flags = NONE @@ -21,7 +20,6 @@ name = "chief engineer's skirt" desc = "It's a yellow dress shirt and black skirt given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding." icon_state = "ce_skirt" - item_color = "ce_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT @@ -30,14 +28,12 @@ name = "chief engineer's turtleneck" desc = "A fancy turtleneck designed to keep the wearer cozy in a cold engineering lobby. Due to budget cuts, the material does not offer any external protection." icon_state = "ce_turtle" - item_color = "ce_turtle" /obj/item/clothing/under/rank/engineering/atmospheric_technician name = "atmospheric technician's jumpsuit" desc = "It's a jumpsuit worn by atmospheric technicians." icon_state = "atmos" inhand_icon_state = "atmos_suit" - item_color = "atmos" resistance_flags = NONE /obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist @@ -71,14 +67,12 @@ name = "atmospheric technician's jumpskirt" desc = "It's a jumpskirt worn by atmospheric technicians." icon_state = "atmos_skirt" - item_color = "atmos_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/engineering/engineer name = "engineer's jumpsuit" desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." icon_state = "engineer" - item_color = "engineer" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 75, ACID = 10) resistance_flags = NONE @@ -90,5 +84,4 @@ name = "engineer's jumpskirt" desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding." icon_state = "engineer_skirt" - item_color = "engineer_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/code/modules/clothing/under/jobs/medical_jumpsuits.dm b/code/modules/clothing/under/jobs/medical_jumpsuits.dm index 815bdabcec7..d2f1f9f0947 100644 --- a/code/modules/clothing/under/jobs/medical_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/medical_jumpsuits.dm @@ -13,28 +13,24 @@ name = "chief medical officer's uniform" desc = "It's a blue dress shirt and black slacks worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." icon_state = "cmo" - item_color = "cmo" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/medical/cmo/skirt name = "chief medical officer's skirt" desc = "It's a blue dress shirt and black skirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." icon_state = "cmo_skirt" - item_color = "cmo_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/medical/cmo/turtleneck name = "chief medical officer's turtleneck" desc = "A fancy turtleneck designed to keep the wearer cozy in a cold medical bay. Due to budget cuts, the material does not offer any external protection." icon_state = "cmo_turtle" - item_color = "cmo_turtle" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/medical/doctor name = "medical doctor's jumpsuit" desc = "It's made of a special fiber that provides protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." icon_state = "medical" - item_color = "medical" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/medical/doctor/sensor @@ -44,112 +40,95 @@ /obj/item/clothing/under/rank/medical/doctor/skirt name = "medical doctor's jumpskirt" icon_state = "medicalf" - item_color = "medicalf" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/medical/virologist name = "virologist's jumpsuit" desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." icon_state = "virology" - item_color = "virology" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/medical/virologist/skirt name = "virologist's jumpskirt" icon_state = "virologyf" - item_color = "virologyf" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/medical/nursesuit name = "nurse's suit" desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." icon_state = "nursesuit" - item_color = "nursesuit" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/medical/nurse name = "nurse's dress" desc = "A dress commonly worn by the nursing staff in the medical department." icon_state = "nurse" - item_color = "nurse" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/medical/orderly name = "orderly's uniform" desc = "A white suit to be worn by orderly people who love orderly things." icon_state = "orderly" - item_color = "orderly" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/medical/scrubs name = "blue medical scrubs" desc = "It's made of a special fiber that provides protection against biohazards. This one is in baby blue." icon_state = "scrubsblue" - item_color = "scrubsblue" permeability_coefficient = 0.1 /obj/item/clothing/under/rank/medical/scrubs/green name = "green medical scrubs" desc = "It's made of a special fiber that provides protection against biohazards. This one is in dark green." icon_state = "scrubsgreen" - item_color = "scrubsgreen" /obj/item/clothing/under/rank/medical/scrubs/purple name = "purple medical scrubs" desc = "It's made of a special fiber that provides protection against biohazards. This one is in deep purple." icon_state = "scrubspurple" - item_color = "scrubspurple" /obj/item/clothing/under/rank/medical/scrubs/coroner name = "coroner's scrubs" desc = "It's made of a special fiber that provides protection against biohazards. This one is as dark as an emo's poetry." icon_state = "scrubsblack" inhand_icon_state = "bl_suit" - item_color = "scrubsblack" /obj/item/clothing/under/rank/medical/chemist name = "chemist's jumpsuit" desc = "It's made of a special fiber that gives minor protection against biohazards. It has a chemist rank stripe on it." icon_state = "chemistry" - item_color = "chemistry" permeability_coefficient = 0.3 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 95) /obj/item/clothing/under/rank/medical/chemist/skirt name = "chemist's jumpskirt" icon_state = "chemistryf" - item_color = "chemistryf" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/medical/paramedic name = "paramedic's jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the back denoting that the wearer is trained medical personnel." icon_state = "paramedic" - item_color = "paramedic" permeability_coefficient = 0.3 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/medical/paramedic/skirt name = "paramedic's jumpskirt" icon_state = "paramedic_skirt" - item_color = "paramedic_skirt" /obj/item/clothing/under/rank/medical/psych name = "psychiatrist's jumpsuit" desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." icon_state = "psych" - item_color = "psych" /obj/item/clothing/under/rank/medical/psych/turtleneck name = "psychologist's turtleneck" desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist." icon_state = "psychturtle" - item_color = "psychturtle" /// Seems like it should be here for organisational purposes /obj/item/clothing/under/rank/medical/gown name = "medical gown" desc = "a flimsy examination gown, the back ties never close." icon_state = "medicalgown" - item_color = "medicalgown" body_parts_covered = UPPER_TORSO|LOWER_TORSO diff --git a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm index c2bc2527414..d00c351110c 100644 --- a/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm +++ b/code/modules/clothing/under/jobs/plasmamen/_plasmamen.dm @@ -9,7 +9,6 @@ strip_delay = 80 species_restricted = list("Plasmaman") sprite_sheets = list("Plasmaman" = 'icons/mob/clothing/species/plasmaman/uniform.dmi') - item_color = "plasmaman" dyeable = TRUE dyeing_key = DYE_REGISTRY_PLASMAMEN permeability_coefficient = 0.6 diff --git a/code/modules/clothing/under/jobs/plasmamen/antags.dm b/code/modules/clothing/under/jobs/plasmamen/antags.dm index 618ddc7b16b..d7d5a875643 100644 --- a/code/modules/clothing/under/jobs/plasmamen/antags.dm +++ b/code/modules/clothing/under/jobs/plasmamen/antags.dm @@ -2,13 +2,11 @@ name = "wizard plasma envirosuit" desc = "An envirosuit for plasmamen designed by the Wizard Federation. Still not spaceworthy..." icon_state = "wizard_envirosuit" - item_color = "wizard_envirosuit" //technically not an antag but a special role none the less /obj/item/clothing/under/plasmaman/centcom name = "central command plasma envirosuit" desc = "A gold trimed envirosuit issued to plasmamen representing the \"N.A.S. Trurl\". Worn exclusively by officers of the Nanotrasen Navy. It's got exotic materials for protection." icon_state = "centcom_envirosuit" - item_color = "centcom_envirosuit" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = INFINITY) displays_id = FALSE diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index 401c0e87bef..d2151488d91 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -2,79 +2,66 @@ name = "cargo plasma envirosuit" desc = "An envirosuit used by plasmaman quartermasters and cargo techs alike, due to the logistical problems of differentiating the two by the length of their pant legs." icon_state = "cargo_envirosuit" - item_color = "cargo_envirosuit" /obj/item/clothing/under/plasmaman/expedition name = "expedition envirosuit" desc = "An airtight brown and blue suit designed for operations in Space by plasmamen.." icon_state = "expedition_envirosuit" - item_color = "expedition_envirosuit" /obj/item/clothing/under/plasmaman/mining name = "mining plasma envirosuit" desc = "An airtight khaki suit designed for operations on Lavaland by plasmamen." icon_state = "explorer_envirosuit" - item_color = "explorer_envirosuit" /obj/item/clothing/under/plasmaman/smith name = "smith envirosuit" desc = "An airtight brown and black suit designed for safety around hot metal for plasmamen." icon_state = "smith_envirosuit" - item_color = "smith_envirosuit" /obj/item/clothing/under/plasmaman/chef name = "chef's plasma envirosuit" desc = "A white plasmaman envirosuit designed for culinary practices. One might question why a member of a species that doesn't need to eat would become a chef." icon_state = "chef_envirosuit" - item_color = "chef_envirosuit" /obj/item/clothing/under/plasmaman/enviroslacks name = "enviroslacks" desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, internal affairs agents, and bartenders alike." icon_state = "enviroslacks" - item_color = "enviroslacks" /obj/item/clothing/under/plasmaman/chaplain name = "chaplain's plasma envirosuit" desc = "An envirosuit specially designed for only the most pious of plasmamen." icon_state = "chap_envirosuit" - item_color = "chap_envirosuit" /obj/item/clothing/under/plasmaman/librarian name = "librarian's plasma envirosuit" desc = "Made out of a modified voidsuit, this suit was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike." icon_state = "prototype_envirosuit" - item_color = "prototype_envirosuit" /obj/item/clothing/under/plasmaman/janitor name = "janitor's plasma envirosuit" desc = "A grey and purple envirosuit designated for plasmaman janitors." icon_state = "janitor_envirosuit" - item_color = "janitor_envirosuit" /obj/item/clothing/under/plasmaman/botany name = "botany envirosuit" desc = "A green and blue envirosuit designed to protect plasmamen from minor plant-related injuries." icon_state = "botany_envirosuit" - item_color = "botany_envirosuit" /obj/item/clothing/under/plasmaman/mime name = "mime envirosuit" desc = "It's not very colourful." icon_state = "mime_envirosuit" - item_color = "mime_envirosuit" /obj/item/clothing/under/plasmaman/clown name = "clown envirosuit" desc = "'HONK!'" icon_state = "clown_envirosuit" - item_color = "clown_envirosuit" /obj/item/clothing/under/plasmaman/assistant name = "assistant's envirosuit" desc = "The finest from the bottom of the plasmamen clothing barrel." icon_state = "assistant_envirosuit" - item_color = "assistant_envirosuit" /obj/item/clothing/under/plasmaman/clown/Extinguish(mob/living/carbon/human/H) if(!istype(H)) @@ -95,35 +82,29 @@ name = "head of personnel's envirosuit" desc = "An envirosuit designed for plasmamen employed as the head of personnel." icon_state = "hop_envirosuit" - item_color = "hop_envirosuit" /obj/item/clothing/under/plasmaman/captain name = "captain's envirosuit" desc = "An envirosuit designed for plasmamen employed as the captain." icon_state = "cap_envirosuit" - item_color = "cap_envirosuit" /obj/item/clothing/under/plasmaman/blueshield name = "blueshield's envirosuit" desc = "An envirosuit designed for plasmamen employed as the blueshield." icon_state = "bs_envirosuit" - item_color = "bs_envirosuit" /obj/item/clothing/under/plasmaman/coke name = "coke envirosuit" desc = "An envirosuit designed by Space Cola Co for plasmamen." icon_state = "coke_envirosuit" - item_color = "coke_envirosuit" /obj/item/clothing/under/plasmaman/tacticool name = "tactical envirosuit" desc = "An envirosuit designed to be sleek and tactical, forged on unknown parts of Boron." icon_state = "tacticool_envirosuit" - item_color = "tacticool_envirosuit" has_sensor = FALSE /obj/item/clothing/under/plasmaman/trainer name = "\improper NT career trainer's envirosuit" desc = "An envirosuit designed for plasmamen employed as the nanotrasen career trainer." icon_state = "trainer_envirosuit" - item_color = "trainer_envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm b/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm index 57993b4d9d2..861f68bd79e 100644 --- a/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm +++ b/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm @@ -2,20 +2,17 @@ name = "engineering plasma envirosuit" desc = "An airtight suit designed to be used by plasmamen employed as engineers, the usual purple stripes being replaced by engineering's orange. It protects the user from fire and acid damage." icon_state = "engineer_envirosuit" - item_color = "engineer_envirosuit" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = INFINITY, ACID = INFINITY) /obj/item/clothing/under/plasmaman/engineering/ce name = "chief engineer's plasma envirosuit" desc = "An airtight suit designed to be used by plasmamen employed as the chief engineer." icon_state = "ce_envirosuit" - item_color = "ce_envirosuit" /obj/item/clothing/under/plasmaman/atmospherics name = "atmospherics plasma envirosuit" desc = "An airtight suit designed to be used by plasmamen employed as atmos technicians, the usual purple stripes being replaced by atmos' blue." icon_state = "atmos_envirosuit" - item_color = "atmos_envirosuit" /obj/item/clothing/under/plasmaman/atmospherics/contortionist desc = "An airtight suit designed to be used by plasmemen for squeezing through narrow vents." diff --git a/code/modules/clothing/under/jobs/plasmamen/medsci.dm b/code/modules/clothing/under/jobs/plasmamen/medsci.dm index e879dc8fd3b..3f1605a79d6 100644 --- a/code/modules/clothing/under/jobs/plasmamen/medsci.dm +++ b/code/modules/clothing/under/jobs/plasmamen/medsci.dm @@ -2,48 +2,40 @@ name = "medical plasma envirosuit" desc = "A suit designed for the station's more plasma-based doctors." icon_state = "doctor_envirosuit" - item_color = "doctor_envirosuit" permeability_coefficient = 0.1 /obj/item/clothing/under/plasmaman/cmo name = "chief medical officer's plasma envirosuit" desc = "A suit designed for the station's more plasma-based chief medical officer." icon_state = "cmo_envirosuit" - item_color = "cmo_envirosuit" permeability_coefficient = 0.1 /obj/item/clothing/under/plasmaman/science name = "science plasma envirosuit" desc = "A plasmaman envirosuit designed for scientists." icon_state = "scientist_envirosuit" - item_color = "scientist_envirosuit" /obj/item/clothing/under/plasmaman/rd name = "research director's plasma envirosuit" desc = "A plasmaman envirosuit designed for the research director." icon_state = "rd_envirosuit" - item_color = "rd_envirosuit" /obj/item/clothing/under/plasmaman/robotics name = "robotics plasma envirosuit" desc = "A plasmaman envirosuit designed for roboticists." icon_state = "roboticist_envirosuit" - item_color = "roboticist_envirosuit" /obj/item/clothing/under/plasmaman/viro name = "virology plasma envirosuit" desc = "The suit worn by the safest people on the station, those who are completely immune to the monstrosities they create." icon_state = "virologist_envirosuit" - item_color = "virologist_envirosuit" /obj/item/clothing/under/plasmaman/genetics name = "genetics plasma envirosuit" desc = "A plasmaman envirosuit designed for geneticists." icon_state = "geneticist_envirosuit" - item_color = "geneticist_envirosuit" /obj/item/clothing/under/plasmaman/chemist name = "chemistry plasma envirosuit" desc = "A plasmaman envirosuit designed for chemists." icon_state = "chemist_envirosuit" - item_color = "chemist_envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/security_plasmasuits.dm b/code/modules/clothing/under/jobs/plasmamen/security_plasmasuits.dm index d935d020e7e..b8a210e33d2 100644 --- a/code/modules/clothing/under/jobs/plasmamen/security_plasmasuits.dm +++ b/code/modules/clothing/under/jobs/plasmamen/security_plasmasuits.dm @@ -2,17 +2,14 @@ name = "security plasma envirosuit" desc = "A plasmaman containment suit designed for security officers, offering a limited amount of extra protection." icon_state = "security_envirosuit" - item_color = "security_envirosuit" armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = INFINITY) /obj/item/clothing/under/plasmaman/security/warden name = "warden plasma envirosuit" desc = "A plasmaman containment suit designed for the warden, white stripes being added to differentiate them from other members of security." icon_state = "warden_envirosuit" - item_color = "warden_envirosuit" /obj/item/clothing/under/plasmaman/security/hos name = "head of security plasma envirosuit" desc = "A plasmaman containment suit designed for the head of security." icon_state = "hos_envirosuit" - item_color = "hos_envirosuit" diff --git a/code/modules/clothing/under/jobs/procedure.dm b/code/modules/clothing/under/jobs/procedure.dm index 3c645e38a5f..b745be31c2a 100644 --- a/code/modules/clothing/under/jobs/procedure.dm +++ b/code/modules/clothing/under/jobs/procedure.dm @@ -12,19 +12,16 @@ name = "\improper Nanotrasen representative's uniform" desc = "Fine black cotton pants and white shirt, with blue and gold trim." icon_state = "ntrep" - item_color = "ntrep" /obj/item/clothing/under/rank/procedure/representative/skirt name = "\improper Nanotrasen representative's skirt" desc = "A silky black skirt and white shirt, with blue and gold trim." icon_state = "ntrep_skirt" - item_color = "ntrep_skirt" /obj/item/clothing/under/rank/procedure/representative/formal name = "formal Nanotrasen representative's uniform" desc = "A formal black suit with gold trim and a blue tie, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder." icon_state = "ntrep_formal" - item_color = "ntrep_formal" displays_id = FALSE /obj/item/clothing/under/rank/procedure/representative/formal/Initialize(mapload) @@ -35,19 +32,16 @@ name = "magistrate's uniform" desc = "Fine black cotton pants and white shirt, with a black tie and gold trim." icon_state = "magistrate" - item_color = "magistrate" /obj/item/clothing/under/rank/procedure/magistrate/skirt name = "magistrate's skirt" desc = "A silky black skirt and white shirt, with a black tie and gold trim." icon_state = "magistrate_skirt" - item_color = "magistrate_skirt" /obj/item/clothing/under/rank/procedure/magistrate/formal name = "formal magistrate's uniform" desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder." icon_state = "magistrate_formal" - item_color = "magistrate_formal" displays_id = FALSE /obj/item/clothing/under/rank/procedure/magistrate/formal/Initialize(mapload) @@ -58,45 +52,38 @@ name = "blueshield's uniform" desc = "A short-sleeved black uniform, paired with grey armored cargo pants, all made out of a sturdy material. Blueshield standard issue." icon_state = "blueshield" - item_color = "blueshield" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) /obj/item/clothing/under/rank/procedure/blueshield/skirt name = "blueshield's skirt" desc = "A short, black and grey with blue markings skirted uniform. For the feminine Blueshield." icon_state = "blueshield_skirt" - item_color = "blueshield_skirt" /obj/item/clothing/under/rank/procedure/blueshield/formal name = "formal blueshield's uniform" desc = "A formal black suit with blue trim and tie, this uniform bears \"Close Protection\" on the left shoulder. It has exotic materials for protection." icon_state = "blueshield_formal" - item_color = "blueshield_formal" displays_id = FALSE /obj/item/clothing/under/rank/procedure/blueshield/turtleneck name = "blueshield's turtleneck" desc = "A fancy turtleneck designed to keep the wearer cozy in a cold bridge. Due to budget cuts, the material does not offer any external protection." icon_state = "bs_turtle" - item_color = "bs_turtle" /obj/item/clothing/under/rank/procedure/iaa name = "Internal Affairs uniform" desc = "The plain, professional attire of an Internal Affairs Agent. The collar is immaculately starched." icon_state = "iaa" - item_color = "iaa" /obj/item/clothing/under/rank/procedure/iaa/purple name = "purple suit" desc = "A fancy set of purple slacks with a black waistcoat and puffy white tie. Exquisite." icon_state = "iaa_purple" - item_color = "iaa_purple" /obj/item/clothing/under/rank/procedure/iaa/blue name = "blue suit" desc = "Classy blue suit pants, white ironed shirt and a red tie. Professional." icon_state = "iaa_blue" - item_color = "iaa_blue" /obj/item/clothing/under/rank/procedure/iaa/formal name = "Internal Affairs formal uniform" @@ -104,38 +91,31 @@ /obj/item/clothing/under/rank/procedure/iaa/formal/black icon_state = "iaa_formal_black" - item_color = "iaa_formal_black" /obj/item/clothing/under/rank/procedure/iaa/formal/black/skirt name = "Internal Affairs formal skirt" icon_state = "iaa_formal_black_skirt" - item_color = "iaa_formal_black_skirt" /obj/item/clothing/under/rank/procedure/iaa/formal/red name = "Internal Affairs formal red suit" icon_state = "iaa_formal_red" - item_color = "iaa_formal_red" /obj/item/clothing/under/rank/procedure/iaa/formal/red/skirt name = "Internal Affairs formal red skirt" icon_state = "iaa_formal_red_skirt" - item_color = "iaa_formal_red_skirt" /obj/item/clothing/under/rank/procedure/iaa/formal/blue name = "Internal Affairs formal blue suit" icon_state = "iaa_formal_blue" - item_color = "iaa_formal_blue" /obj/item/clothing/under/rank/procedure/iaa/formal/blue/skirt name = "Internal Affairs formal blue skirt" icon_state = "iaa_formal_blue_skirt" - item_color = "iaa_formal_blue_skirt" /obj/item/clothing/under/rank/procedure/iaa/formal/goodman // You get ONE lawyer reference, IAA... name = "criminal lawyer suit" desc = "It's all good, man!" icon_state = "iaa_formal_goodman" - item_color = "iaa_formal_goodman" /obj/item/clothing/under/rank/procedure/iaa/formal/goodman/examine(mob/user) . = ..() @@ -144,16 +124,13 @@ /obj/item/clothing/under/rank/procedure/iaa/formal/goodman/skirt name = "criminal lawyer skirt" icon_state = "iaa_formal_goodman_skirt" - item_color = "iaa_formal_goodman_skirt" /obj/item/clothing/under/rank/procedure/nct name = "\improper NT Career Trainer's uniform" desc = "A neatly pressed olive green shirt paired with black jeans, worn by those dedicated to shaping the future of the workforce." icon_state = "trainer" - item_color = "trainer" /obj/item/clothing/under/rank/procedure/nct/skirt name = "\improper NT Career Trainer's skirt" desc = "A neatly pressed olive green shirt paired with a sleek black skirt, worn by those committed to mentoring the next generation." icon_state = "trainer_skirt" - item_color = "trainer_skirt" diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index 164f1048e8b..f8f6aeaa7af 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -12,65 +12,55 @@ name = "research director's uniform" desc = "It's a purple dress shirt and black slacks worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants." icon_state = "rd" - item_color = "rd" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 25) /obj/item/clothing/under/rank/rnd/rd/skirt name = "research director's skirt" desc = "It's a purple dress shirt and black skirt worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants." icon_state = "rd_skirt" - item_color = "rd_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/rnd/rd/dress name = "research director's dress uniform" desc = "Feminine fashion for the style conscious RD." icon_state = "dress_rd" - item_color = "dress_rd" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT /obj/item/clothing/under/rank/rnd/rd/turtleneck desc = "A fancy turtleneck designed to keep the wearer cozy in a cold research lobby. Due to budget cuts, the material does not offer any external protection." icon_state = "rd_turtle" - item_color = "rd_turtle" /obj/item/clothing/under/rank/rnd/scientist name = "scientist's jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist." icon_state = "science" - item_color = "science" permeability_coefficient = 0.50 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/rank/rnd/scientist/skirt name = "scientist's jumpskirt" icon_state = "sciencewhitef" - item_color = "sciencewhitef" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/rnd/roboticist name = "roboticist's jumpsuit" desc = "It's a slimming black with reinforced seams; great for industrial work." icon_state = "robotics" - item_color = "robotics" resistance_flags = NONE /obj/item/clothing/under/rank/rnd/roboticist/skirt name = "roboticist's jumpskirt" desc = "It's a slimming black jumpskirt with reinforced seams; great for industrial work." icon_state = "roboticsf" - item_color = "roboticsf" /obj/item/clothing/under/rank/rnd/geneticist name = "geneticist's jumpsuit" desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." icon_state = "genetics" - item_color = "genetics" permeability_coefficient = 0.50 /obj/item/clothing/under/rank/rnd/geneticist/skirt name = "geneticist's jumpskirt" icon_state = "geneticswhitef" - item_color = "geneticswhitef" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS diff --git a/code/modules/clothing/under/jobs/security_jumpsuits.dm b/code/modules/clothing/under/jobs/security_jumpsuits.dm index b3009c1a0bb..366f30ba756 100644 --- a/code/modules/clothing/under/jobs/security_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/security_jumpsuits.dm @@ -14,24 +14,20 @@ name = "warden's jumpsuit" desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders." icon_state = "warden" - item_color = "warden" /obj/item/clothing/under/rank/security/warden/skirt name = "warden's jumpskirt" desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders." icon_state = "warden_skirt" - item_color = "warden_skirt" /obj/item/clothing/under/rank/security/warden/skirt/corporate icon_state = "warden_corporate_skirt" inhand_icon_state = "bl_suit" - item_color = "warden_corporate_skirt" /obj/item/clothing/under/rank/security/warden/turtleneck name = "warden's turtleneck" desc = "A fancy turtleneck designed to keep the wearer warm in a cold prison. Due to budget cuts, the material does not offer any external protection." icon_state = "ward_turtle" - item_color = "ward_turtle" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/security.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/security.dmi', @@ -43,7 +39,6 @@ name = "security officer's jumpsuit" desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." icon_state = "security" - item_color = "security" /obj/item/clothing/under/rank/security/officer/sensor sensor_mode = SENSOR_COORDS @@ -53,48 +48,40 @@ name = "security officer's jumpskirt" desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts." icon_state = "security_skirt" - item_color = "security_skirt" /obj/item/clothing/under/rank/security/officer/skirt/corporate name = "corporate security jumpskirt" icon_state = "sec_corporate_skirt" inhand_icon_state = "bl_suit" - item_color = "sec_corporate_skirt" /obj/item/clothing/under/rank/security/officer/fancy name = "security dress shirt" desc = "A red dress shirt paired with a pair of black trousers, for the more formal Security Officer." icon_state = "sec_shirt" - item_color = "sec_shirt" /obj/item/clothing/under/rank/security/officer/skirt/fancy name = "security dress skirt" desc = "A red blouse paired with a black skirt, for the more formal Security Officer." icon_state = "sec_shirt_skirt" - item_color = "sec_shirt_skirt" /obj/item/clothing/under/rank/security/officer/dispatch name = "dispatcher's uniform" desc = "A dress shirt and khakis with a security patch sewn on." icon_state = "dispatch" - item_color = "dispatch" /obj/item/clothing/under/rank/security/officer/uniform name = "security officer's uniform" desc = "It's made of a slightly sturdier material, to allow for robust protection." icon_state = "redshirt" //pants, actually - item_color = "redshirt" /obj/item/clothing/under/rank/security/officer/corporate name = "corporate security jumpsuit" icon_state = "sec_corporate" inhand_icon_state = "bl_suit" - item_color = "sec_corporate" /obj/item/clothing/under/rank/security/warden/corporate icon_state = "warden_corporate" inhand_icon_state = "bl_suit" - item_color = "warden_corporate" /* * Detective @@ -104,7 +91,6 @@ desc = "Someone who wears this means business." icon_state = "detective" inhand_icon_state = "bl_suit" - item_color = "detective" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/security.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/security.dmi', @@ -115,13 +101,11 @@ /obj/item/clothing/under/rank/security/detective/skirt name = "detective's jumpskirt" icon_state = "det_skirt" - item_color = "det_skirt" /obj/item/clothing/under/rank/security/detective/black name = "forensics jumpsuit" desc = "A black forensics technician jumpsuit." icon_state = "det_black" - item_color = "det_black" /* * Head of Security @@ -130,7 +114,6 @@ name = "head of security's jumpsuit" desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." icon_state = "hos" - item_color = "hos" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50) strip_delay = 60 @@ -138,44 +121,37 @@ name = "head of security's jumpskirt" desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." icon_state = "hos_skirt" - item_color = "hos_skirt" dyeable = TRUE dyeing_key = DYE_REGISTRY_JUMPSKIRT /obj/item/clothing/under/rank/security/head_of_security/corporate icon_state = "hos_corporate" inhand_icon_state = "bl_suit" - item_color = "hos_corporate" /obj/item/clothing/under/rank/security/head_of_security/skirt/corporate icon_state = "hos_corporate_skirt" inhand_icon_state = "bl_suit" - item_color = "hos_corporate_skirt" /obj/item/clothing/under/rank/security/formal name = "security suit" desc = "A formal security suit for officers complete with nanotrasen belt buckle." icon_state = "sec_formal" inhand_icon_state = "gy_suit" - item_color = "sec_formal" /obj/item/clothing/under/rank/security/formal/warden name = "warden's suit" desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders." icon_state = "warden_formal" - item_color = "warden_formal" /obj/item/clothing/under/rank/security/formal/head_of_security name = "head of security's suit" desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security." icon_state = "hos_formal" - item_color = "hos_formal" /obj/item/clothing/under/rank/security/head_of_security/turtleneck name = "head of security's turtleneck" desc = "A fancy turtleneck designed to keep the wearer cozy in a cold security lobby. Due to budget cuts, the material does not offer any external protection." icon_state = "hos_turtle" - item_color = "hos_turtle" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/security.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/security.dmi', diff --git a/code/modules/clothing/under/misc_jumpsuits.dm b/code/modules/clothing/under/misc_jumpsuits.dm index cc03ea9db86..2d333cea8e6 100644 --- a/code/modules/clothing/under/misc_jumpsuits.dm +++ b/code/modules/clothing/under/misc_jumpsuits.dm @@ -6,66 +6,56 @@ name = "red pj's" desc = "Sleepwear." icon_state = "red_pyjamas" - item_color = "red_pyjamas" /obj/item/clothing/under/misc/pj/blue name = "blue pj's" desc = "Sleepwear." icon_state = "blue_pyjamas" - item_color = "blue_pyjamas" /obj/item/clothing/under/misc/scratch name = "white suit" desc = "A white suit, suitable for an excellent host." icon_state = "scratch" - item_color = "scratch" /obj/item/clothing/under/misc/sl_suit name = "amish suit" desc = "It's a very amish looking suit." icon_state = "sl_suit" - item_color = "sl_suit" /obj/item/clothing/under/misc/waiter name = "waiter's outfit" desc = "It's a very smart uniform with a special pocket for tip." icon_state = "waiter" - item_color = "waiter" /obj/item/clothing/under/misc/mailman name = "mailman's jumpsuit" desc = "'Special delivery!'" icon_state = "mailman" inhand_icon_state = "b_suit" - item_color = "mailman" /obj/item/clothing/under/misc/vice name = "vice officer's jumpsuit" desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision." icon_state = "vice" inhand_icon_state = "gy_suit" - item_color = "vice" /obj/item/clothing/under/misc/gimmick_captain_suit name = "captain's suit" desc = "A green suit and yellow necktie. Exemplifies authority." icon_state = "green_suit" inhand_icon_state = "dg_suit" - item_color = "green_suit" /obj/item/clothing/under/misc/overalls name = "laborer's overalls" desc = "A set of durable overalls for getting the job done." icon_state = "overalls" inhand_icon_state = "lb_suit" - item_color = "overalls" /obj/item/clothing/under/misc/assistantformal name = "assistant's formal uniform" desc = "An assistant's formal-wear. Why an assistant needs formal-wear is still unknown." icon_state = "assistant_formal" inhand_icon_state = "gy_suit" - item_color = "assistant_formal" /obj/item/clothing/under/cursedclown name = "cursed clown suit" @@ -76,7 +66,6 @@ inhand_icon_state = "cclown_uniform" lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi' righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi' - item_color = "cursedclown" flags = NODROP resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF has_sensor = FALSE // HUNKE @@ -91,75 +80,63 @@ name = "burial garments" desc = "Traditional burial garments from the early 22nd century." icon_state = "burial" - item_color = "burial" /obj/item/clothing/under/misc/redhawaiianshirt name = "red hawaiian shirt" desc = "a floral shirt worn to most vacation destinations." icon_state = "hawaiianred" - item_color = "hawaiianred" /obj/item/clothing/under/misc/pinkhawaiianshirt name = "pink hawaiian shirt" desc = "a pink floral shirt the material feels cool and comfy." icon_state = "hawaiianpink" - item_color = "hawaiianpink" /obj/item/clothing/under/misc/orangehawaiianshirt name = "orange hawaiian shirt" desc = "a orange floral shirt for a relaxing day in space." icon_state = "hawaiianorange" - item_color = "hawaiianorange" /obj/item/clothing/under/misc/bluehawaiianshirt name = "blue hawaiian shirt" desc = "a blue floral shirt it has a oddly colored pink flower on it." icon_state = "hawaiianblue" - item_color = "hawaiianblue" /obj/item/clothing/under/misc/durathread name = "durathread jumpsuit" desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer." icon_state = "durathread" - item_color = "durathread" armor = list(MELEE = 5, BULLET = 0, LASER = 5, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 0) /obj/item/clothing/under/misc/swimsuit/black name = "black swimsuit" desc = "An oldfashioned black swimsuit." icon_state = "swim_black" - item_color = "swim_black" /obj/item/clothing/under/misc/swimsuit/blue name = "blue swimsuit" desc = "An oldfashioned blue swimsuit." icon_state = "swim_blue" - item_color = "swim_blue" /obj/item/clothing/under/misc/swimsuit/purple name = "purple swimsuit" desc = "An oldfashioned purple swimsuit." icon_state = "swim_purp" - item_color = "swim_purp" /obj/item/clothing/under/misc/swimsuit/green name = "green swimsuit" desc = "An oldfashioned green swimsuit." icon_state = "swim_green" - item_color = "swim_green" /obj/item/clothing/under/misc/swimsuit/red name = "red swimsuit" desc = "An oldfashioned red swimsuit." icon_state = "swim_red" - item_color = "swim_red" /obj/item/clothing/under/misc/acj name = "administrative cybernetic jumpsuit" desc = "it's a cybernetically enhanced jumpsuit used for administrative duties." icon_state = "syndicate" inhand_icon_state = "bl_suit" - item_color = "syndicate" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index d1e46c7fd42..284d2e92d47 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -25,80 +25,66 @@ name = "classic jeans" desc = "You feel cooler already." icon_state = "jeansclassic" - item_color = "jeansclassic" /obj/item/clothing/under/pants/mustangjeans name = "Must Hang jeans" desc = "Made in the finest space jeans factory this side of Alpha Centauri." icon_state = "jeansmustang" - item_color = "jeansmustang" /obj/item/clothing/under/pants/blackjeans name = "black jeans" desc = "Only for those who can pull it off." icon_state = "jeansblack" - item_color = "jeansblack" /obj/item/clothing/under/pants/youngfolksjeans name = "Young Folks jeans" desc = "For those tired of boring old jeans. Relive the passion of your youth!" icon_state = "jeansyoungfolks" - item_color = "jeansyoungfolks" /obj/item/clothing/under/pants/white name = "white pants" desc = "Plain white pants. Boring." icon_state = "whitepants" - item_color = "whitepants" /obj/item/clothing/under/pants/red name = "red pants" desc = "Bright red pants. Overflowing with personality." icon_state = "redpants" - item_color = "redpants" /obj/item/clothing/under/pants/black name = "black pants" desc = "These pants are dark, like your soul." icon_state = "blackpants" - item_color = "blackpants" /obj/item/clothing/under/pants/tan name = "tan pants" desc = "Some tan pants. You look like a white collar worker with these on." icon_state = "tanpants" - item_color = "tanpants" /obj/item/clothing/under/pants/blue name = "blue pants" desc = "Stylish blue pants. These go well with a lot of clothes." icon_state = "bluepants" - item_color = "bluepants" /obj/item/clothing/under/pants/track name = "track pants" desc = "A pair of track pants, for the athletic." icon_state = "trackpants" - item_color = "trackpants" /obj/item/clothing/under/pants/jeans name = "jeans" desc = "A nondescript pair of tough blue jeans." icon_state = "jeans" - item_color = "jeans" /obj/item/clothing/under/pants/khaki name = "khaki pants" desc = "A pair of dust beige khaki pants." icon_state = "khaki" - item_color = "khaki" /obj/item/clothing/under/pants/camo name = "camo pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." icon_state = "camopants" - item_color = "camopants" - //Shorts ARE pants, right? /obj/item/clothing/under/pants/shorts @@ -108,26 +94,20 @@ /obj/item/clothing/under/pants/shorts/red icon_state = "redshorts" - item_color = "redshorts" /obj/item/clothing/under/pants/shorts/green icon_state = "greenshorts" - item_color = "greenshorts" /obj/item/clothing/under/pants/shorts/blue icon_state = "blueshorts" - item_color = "blueshorts" /obj/item/clothing/under/pants/shorts/black icon_state = "blackshorts" - item_color = "blackshorts" /obj/item/clothing/under/pants/shorts/grey icon_state = "greyshorts" - item_color = "greyshorts" /obj/item/clothing/under/pants/shorts/jeanshorts name = "jean shorts" desc = "The trendy shorts your mother never let you wear. Now in space!" icon_state = "jeanshorts" - item_color = "jeanshorts" diff --git a/code/modules/clothing/under/retro.dm b/code/modules/clothing/under/retro.dm index 0cb1afb0b36..79288e77b29 100644 --- a/code/modules/clothing/under/retro.dm +++ b/code/modules/clothing/under/retro.dm @@ -8,22 +8,18 @@ name = "retro security officer's uniform" desc = "A (now) retro corporate security jumpsuit. It doesn't have any sort of robust fabric, good ol' NT cutting costs." icon_state = "retro_sec" - item_color = "retro_sec" /obj/item/clothing/under/retro/medical name = "retro medical officer's uniform" desc = "A once biologically resistant medical uniform. The high-vis stripes are faded and unreflective." icon_state = "retro_med" - item_color = "retro_med" /obj/item/clothing/under/retro/engineering name = "retro engineering uniform" desc = "A faded grimy engineering jumpsuit and overall combo. It's coated with oil, dust, and grit." icon_state = "retro_eng" - item_color = "retro_eng" /obj/item/clothing/under/retro/science name = "retro science officer's uniform" desc = "A faded polo and set of distinct white slacks. What a ridiculous tie." icon_state = "retro_sci" - item_color = "retro_sci" diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm index c682fbac47c..4aa6ff5414a 100644 --- a/code/modules/clothing/under/solgov.dm +++ b/code/modules/clothing/under/solgov.dm @@ -5,7 +5,6 @@ icon_state = "solgov" worn_icon = 'icons/mob/clothing/under/solgov.dmi' inhand_icon_state = "ro_suit" - item_color = "solgov" armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 20, ACID = 20) displays_id = FALSE sprite_sheets = list("Grey" = 'icons/mob/clothing/species/grey/under/solgov.dmi') @@ -14,25 +13,21 @@ name = "\improper MARSOC uniform" desc = "A comfortable and durable combat uniform worn by marines of the Trans-Solar Federation's Marine Special Operations Command." icon_state = "solgovelite" - item_color = "solgovelite" /obj/item/clothing/under/solgov/command name = "\improper TSF officer's uniform" desc = "A comfortable and durable combat uniform worn by junior officers of the Trans-Solar Marine Corps." icon_state = "solgovc" - item_color = "solgovc" /obj/item/clothing/under/solgov/command/elite name = "\improper MARSOC officer's uniform" desc = "A comfortable and durable combat uniform worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. This one has additional insignia on its shoulders and cuffs." icon_state = "solgovcelite" - item_color = "solgovcelite" /obj/item/clothing/under/solgov/rep name = "\improper TSF representative's uniform" desc = "A formal uniform worn by the diplomatic representatives of the Trans-Solar Federation." icon_state = "solgovr" - item_color = "solgovr" /obj/item/clothing/under/solgov/viper name = "\improper Federation infiltrator uniform" diff --git a/code/modules/clothing/under/suit.dm b/code/modules/clothing/under/suit.dm index c38b58a0d5d..da35c3708f0 100644 --- a/code/modules/clothing/under/suit.dm +++ b/code/modules/clothing/under/suit.dm @@ -18,91 +18,76 @@ name = "black suit" desc = "A black suit and red tie. Very formal." icon_state = "black_suit" - item_color = "black_suit" /obj/item/clothing/under/suit/really_black name = "executive suit" desc = "A formal black suit and red tie, intended for the station's finest." icon_state = "really_black_suit" - item_color = "really_black_suit" /obj/item/clothing/under/suit/female name = "executive suit" desc = "A formal trouser suit for women, intended for the station's finest." icon_state = "black_suit_fem" inhand_icon_state = "gy_suit" - item_color = "black_suit_fem" /obj/item/clothing/under/suit/navy name = "navy suit" desc = "A navy suit and red tie, intended for the station's finest." icon_state = "navy_suit" - item_color = "navy_suit" /obj/item/clothing/under/suit/tan name = "tan suit" desc = "A tan suit with a yellow tie. Smart, but casual." icon_state = "tan_suit" inhand_icon_state = "lb_suit" - item_color = "tan_suit" /obj/item/clothing/under/suit/burgundy name = "burgundy suit" desc = "A burgundy suit and black tie. Somewhat formal." icon_state = "burgundy_suit" - item_color = "burgundy_suit" /obj/item/clothing/under/suit/charcoal name = "charcoal suit" desc = "A charcoal suit and blue tie. Very professional." icon_state = "charcoal_suit" - item_color = "charcoal_suit" /obj/item/clothing/under/suit/checkered name = "checkered suit" desc = "That's a very nice suit you have there. Shame if something were to happen to it, eh?" icon_state = "checkered_suit" inhand_icon_state = "gy_suit" - item_color = "checkered_suit" /obj/item/clothing/under/suit/mafia name = "mafia outfit" desc = "The business of the mafia is business." icon_state = "mafia" - item_color = "mafia" /obj/item/clothing/under/suit/mafia/vest name = "mafia vest" desc = "Extreme problems often require extreme solutions." icon_state = "mafiavest" - item_color = "mafiavest" /obj/item/clothing/under/suit/mafia/white name = "white mafia outfit" desc = "The best defense against the treacherous is treachery." icon_state = "mafiawhite" - item_color = "mafiawhite" /obj/item/clothing/under/suit/mafia/tan name = "tan mafia outfit" desc = "The big drum sounds good only from a distance." icon_state = "tan_suit" inhand_icon_state = "lb_suit" - item_color = "tan_suit" /obj/item/clothing/under/suit/victsuit name = "victorian suit" desc = "A victorian style suit, fancy!" icon_state = "victorianvest" - item_color = "victorianvest" body_parts_covered = UPPER_TORSO|LOWER_TORSO /obj/item/clothing/under/suit/victsuit/redblk name = "red and black victorian suit" icon_state = "victorianblred" - item_color = "victorianblred" /obj/item/clothing/under/suit/victsuit/red name = "red victorian suit" icon_state = "victorianredvest" - item_color = "victorianredvest" diff --git a/code/modules/clothing/under/syndicate_jumpsuits.dm b/code/modules/clothing/under/syndicate_jumpsuits.dm index dc966632ee7..e5889480486 100644 --- a/code/modules/clothing/under/syndicate_jumpsuits.dm +++ b/code/modules/clothing/under/syndicate_jumpsuits.dm @@ -5,7 +5,6 @@ icon_state = "syndicate" worn_icon = 'icons/mob/clothing/under/syndicate.dmi' inhand_icon_state = "bl_suit" - item_color = "syndicate" has_sensor = FALSE armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 35) sprite_sheets = list( @@ -18,27 +17,23 @@ name = "combat uniform" desc = "With a suit lined with this many pockets, you are ready to operate." icon_state = "syndicate_combat" - item_color = "syndicate_combat" /obj/item/clothing/under/syndicate/greyman name = "greyman henley" desc = "Attire for someone who finds it hard to survive in the safest place known to man - urban environment." icon_state = "greyman" - item_color = "greyman" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 40, ACID = 35) /obj/item/clothing/under/syndicate/tacticool name = "tacticool turtleneck" desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." icon_state = "tactifool" - item_color = "tactifool" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 35) /obj/item/clothing/under/syndicate/sniper name = "tactical suit" desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp." icon_state = "tactical_suit" - item_color = "tactical_suit" /obj/item/clothing/under/syndicate/silicon_cham desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. This one has extra cybernetic modifications." diff --git a/code/modules/clothing/under/ussp.dm b/code/modules/clothing/under/ussp.dm index b9ac8042c9b..b1fd789170e 100644 --- a/code/modules/clothing/under/ussp.dm +++ b/code/modules/clothing/under/ussp.dm @@ -4,17 +4,14 @@ icon = 'icons/obj/clothing/under/ussp.dmi' icon_state = "soviet" worn_icon = 'icons/mob/clothing/under/ussp.dmi' - item_color = "soviet" sprite_sheets = null /obj/item/clothing/under/new_soviet/sovietofficer name = "\improper Soviet officer uniform" desc = "A U.S.S.P commanding officer's uniform." icon_state = "sovietofficer" - item_color = "sovietofficer" /obj/item/clothing/under/new_soviet/sovietadmiral name = "\improper Soviet admiral uniform" desc = "A U.S.S.P naval admiral's uniform." icon_state = "sovietadmiral" - item_color = "sovietadmiral" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 0a1932d6a77..c11eb49148d 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -25,6 +25,10 @@ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' +/obj/item/clothing/under/pants/fluff + icon = 'icons/obj/custom_items.dmi' + worn_icon = 'icons/mob/clothing/under/donator.dmi' + /// Generic tattoo gun, make subtypes for different folks /obj/item/fluff/tattoo_gun name = "disposable tattoo pen" @@ -1095,10 +1099,9 @@ name = "Rissa's hand-me-downs" desc = "An old, hand-me-down baggy sweater and sweatpants combo. A label on the neck reads 'RISSA' in scruffy handwriting." icon = 'icons/obj/custom_items.dmi' - icon_state = "counterfeitguise" // doesn't exist + icon_state = "counterfeitguise" lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "counterfeitguise" /// Benjaminfallout: Pretzel Brassheart /obj/item/clothing/under/fluff/benjaminfallout @@ -1106,7 +1109,6 @@ name = "Pretzel's dress" desc = "A nice looking dress." icon_state = "fallout_dress" - item_color = "fallout_dress" /// Norstead : Natalya Sokolova /obj/item/clothing/under/fluff/soviet_casual_uniform @@ -1114,7 +1116,6 @@ name = "Soviet Casual Uniform" desc = "Female U.S.S.P. casual wear. Dlya Rodiny!" icon_state = "soviet_casual_uniform" - item_color = "soviet_casual_uniform" /// Kharshai: Athena Castile /obj/item/clothing/under/fluff/kharshai @@ -1122,7 +1123,6 @@ desc = "A white and gold formal uniform, accompanied by a small pin with the numbers '004' etched upon it." icon = 'icons/obj/custom_items.dmi' icon_state = "castile_dress" - item_color = "castile_dress" /// Xantholne: Meex Zwichsnicrur /obj/item/clothing/under/fluff/xantholne @@ -1132,7 +1132,6 @@ icon_state = "xantholne" lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "xantholne" /// FlattestGuitar9: Eli Randolph /obj/item/clothing/under/fluff/elishirt @@ -1141,7 +1140,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "elishirt" inhand_icon_state = "ba_suit" - item_color = "elishirt" displays_id = FALSE /// Jayfeather: Jay Wingler @@ -1151,7 +1149,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "jaywingler" inhand_icon_state = "bl_suit" - item_color = "jaywingler" displays_id = FALSE /// Xilia: Isaca Sirius @@ -1166,7 +1163,6 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "jane_sid_suit" inhand_icon_state = "gy_suit" - item_color = "jane_sid_suit" has_sensor = 2 sensor_mode = SENSOR_COORDS @@ -1177,14 +1173,13 @@ if(usr.stat || usr.restrained()) return 0 - if(src.icon_state == "jane_sid_suit_down") - src.item_color = "jane_sid_suit" + if(icon_state == "jane_sid_suit_down") + icon_state = "jane_sid_suit" to_chat(usr, "You zip up \the [src].") else - src.item_color = "jane_sid_suit_down" + icon_state = "jane_sid_suit_down" to_chat(usr, "You unzip and roll down \the [src].") - src.icon_state = "[item_color]" usr.update_inv_w_uniform() /// MrBarrelrolll: Maximus Greenwood @@ -1193,8 +1188,8 @@ desc = "A set of chainmail adorned with a hide mantle. \"Greenwood\" is engraved into the right breast." icon = 'icons/obj/clothing/under/costumes.dmi' icon_state = "roman" + worn_icon_state = "maximus_armor" inhand_icon_state = "armor" - item_color = "maximus_armor" displays_id = FALSE strip_delay = 100 @@ -1207,7 +1202,6 @@ inhand_icon_state = "aegisuniform" lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "aegisuniform" displays_id = FALSE /// vforcebomber: E.L.O. @@ -1215,8 +1209,7 @@ name = "E.L.O's Turtleneck" desc = "This TurtleNeck belongs to the IPC E.L.O. And has her name sown into the upper left breast, a very wooly jumper." icon = 'icons/obj/custom_items.dmi' // for the floor sprite - icon_state = "eloturtleneckfloor" - item_color = "eloturtleneck" + icon_state = "eloturtleneck" displays_id = FALSE //////////// Masks //////////// @@ -1256,14 +1249,12 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "fox_suit" inhand_icon_state = "g_suit" - item_color = "fox_suit" displays_id = FALSE //still appears on examine; this is pure fluff. /obj/item/clothing/suit/storage/fox/miljacket_desert name = "rugged military jacket" desc = "A rugged brown military jacket with a stylized 'A' embroidered on the back. It seems very old, yet is in near mint condition. Has a tag on the inside collar signed 'Fox McCloud'." icon_state = "fox_coat" - item_color = "fox_coat" /obj/item/toy/plushie/fluff/fox name = "orange fox plushie" @@ -1300,7 +1291,6 @@ desc = "It's what an evil genius would design if he switched brains with the Amazing Arachno-Man. Actually, he'd probably add weird tentacles that come out the back, too." icon = 'icons/obj/clothing/under/donator.dmi' icon_state = "superior_suit" - item_color = "superior_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS flags_inv = HIDEGLOVES|HIDESHOES @@ -1384,10 +1374,7 @@ /obj/item/clothing/under/pants/fluff/combat name = "combat pants" desc = "Medium style tactical pants, for the fashion aware combat units out there." - icon = 'icons/mob/clothing/under/donator.dmi' - icon_state = "combat_pants_s" - worn_icon = 'icons/mob/clothing/under/donator.dmi' - item_color = "combat_pants" + icon_state = "combat_pants" sprite_sheets = list( "Vox" = 'icons/mob/clothing/species/vox/under/donator.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/donator.dmi', @@ -1488,7 +1475,6 @@ desc = "A locket with a orange gem set on the front, the picture inside seems to be of a Tajaran." icon = 'icons/obj/custom_items.dmi' icon_state = "fethasnecklace" - item_color = "fethasnecklace" slot_flags = ITEM_SLOT_MASK | ITEM_SLOT_ACCESSORY /// HugoLuman: Dan Martinez @@ -1499,7 +1485,6 @@ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' icon_state = "sheetcosmos" - item_color = "sheetcosmos" /// Lightfire: Hyperion /obj/item/clothing/head/fluff/lfbowler @@ -1514,7 +1499,6 @@ desc = "A blue and black victorian suit with silver buttons, very fancy!" icon = 'icons/obj/custom_items.dmi' icon_state = "victorianlightfire" - item_color = "victorianlightfire" displays_id = FALSE /// LightFire53: Ikelos @@ -1555,7 +1539,6 @@ to_chat(H, "You modify the appearance of [P].") playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5) P.icon_state = "ikelos_envirosuit" - P.item_color = "ikelos_envirosuit" P.icon = 'icons/obj/custom_items.dmi' if(P == H.w_uniform) @@ -1587,7 +1570,6 @@ desc = "This medal is cut into the shape of a Victoria Cross, and is awarded to those who have proven themselves to Nanotrasen with a long and successful career." icon = 'icons/obj/custom_items.dmi' icon_state = "elo-medal" - item_color = "elo-medal" /// Furasian: Fillmoore Grayson /obj/item/clothing/suit/fluff/vetcoat @@ -1613,7 +1595,6 @@ desc = "A medal from the bygone Asteroid Wars. Its Ruby shines with a strange intensity." icon = 'icons/obj/custom_items.dmi' icon_state = "panzermedal" - item_color = "panzermedal" /// Sagrotter: Xann Zxiax /obj/item/clothing/accessory/medal/fluff/xann_zxiax @@ -1621,7 +1602,6 @@ desc = "Green Garnet on fancy blue cord, when you look at the Garnet, you feel strangely appeased." icon = 'icons/obj/custom_items.dmi' icon_state = "Xann_necklace" - item_color = "Xann_necklace" /// Rb303: Isthel Eisenwald /obj/item/clothing/accessory/rbscarf @@ -1629,7 +1609,6 @@ desc = "An old, striped purple scarf. It appears to be hand-knitted and has the name 'Isthel' written on it in bad handwriting." icon = 'icons/obj/custom_items.dmi' icon_state = "rbscarf" - item_color = "rbscarf" /// Pineapple Salad: Dan Jello /obj/item/clothing/head/fluff/pinesalad_horns @@ -1653,7 +1632,6 @@ icon_state = "kiaoutfit" lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "kiaoutfit" displays_id = FALSE species_restricted = list("Vox") @@ -1665,7 +1643,6 @@ icon_state = "kiahat" lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "kiahat" /// FullOfSkittles: Kiachi /obj/item/clothing/mask/gas/fluff/kiamask @@ -1676,7 +1653,6 @@ inhand_icon_state = null lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "kiamask" species_restricted = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi') @@ -1707,7 +1683,6 @@ icon_state = "kikeridress" lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "kikeridress" body_parts_covered = UPPER_TORSO|LOWER_TORSO species_restricted = list("Vox") @@ -1720,7 +1695,6 @@ inhand_icon_state = null lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "kikerimask" species_restricted = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi') @@ -1733,7 +1707,6 @@ inhand_icon_state = null lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' - item_color = "yahiyamask" species_restricted = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/mask.dmi') @@ -1747,13 +1720,11 @@ name = "rebel outfit" desc = "Made in Seattle, 2216." icon_state = "colin_earle" - item_color = "colin_earle" // Paratoberfest/contributor rewards /obj/item/clothing/accessory/pin/reward // Default pin, DO NOT USE - Use the subtypes below icon = 'icons/obj/custom_items.dmi' icon_state = "pin_coding" - item_color = "pin_coding" /obj/item/clothing/accessory/pin/reward/coding name = "Coding Contribution Pin" @@ -1763,13 +1734,11 @@ name = "Mapping Contribution Pin" desc = "A commemorative pin to reward contributions of mapping." icon_state = "pin_mapping" - item_color = "pin_mapping" /obj/item/clothing/accessory/pin/reward/spriting name = "Spriting Contribution Pin" desc = "A commemorative pin to reward contributions of spriting." icon_state = "pin_spriting" - item_color = "pin_spriting" #undef USED_MOD_HELM #undef USED_MOD_SUIT diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index e51708c4cb3..cee7554ccc3 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -528,40 +528,31 @@ to_chat(usr, "You color \the [src] [clr]") icon_state = "egg-[clr]" - item_color = clr return ITEM_INTERACT_COMPLETE /obj/item/food/egg/blue icon_state = "egg-blue" - item_color = "blue" /obj/item/food/egg/green icon_state = "egg-green" - item_color = "green" /obj/item/food/egg/mime icon_state = "egg-mime" - item_color = "mime" /obj/item/food/egg/orange icon_state = "egg-orange" - item_color = "orange" /obj/item/food/egg/purple icon_state = "egg-purple" - item_color = "purple" /obj/item/food/egg/rainbow icon_state = "egg-rainbow" - item_color = "rainbow" /obj/item/food/egg/red icon_state = "egg-red" - item_color = "red" /obj/item/food/egg/yellow icon_state = "egg-yellow" - item_color = "yellow" /obj/item/food/egg/gland desc = "An egg! It looks weird..." diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index c2096ee731a..ff6a9cc2561 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -196,7 +196,6 @@ name = "berserker helmet" desc = "Peering into the eyes of the helmet is enough to seal damnation." icon_state = "hardsuit0-berserker" - item_color = "berserker" light_color = BERSERK_COLOUR light_power = 4 actions_types = list(/datum/action/item_action/berserk_mode) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 0c4ab7f1fe1..d44871697cd 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -586,7 +586,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT)) var/worn_icon = listgetindex(w_uniform.sprite_sheets, dna.species.sprite_sheet_name) || w_uniform.worn_icon || 'icons/mob/clothing/under/misc.dmi' - var/worn_icon_state = w_uniform.item_color || w_uniform.worn_icon_state || w_uniform.icon_state + var/worn_icon_state = w_uniform.worn_icon_state || w_uniform.icon_state var/mutable_appearance/standing = mutable_appearance(worn_icon, "[worn_icon_state]_s", layer = -UNIFORM_LAYER, alpha = w_uniform.alpha, color = w_uniform.color) if(w_uniform.blood_DNA) @@ -597,7 +597,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(length(w_uniform.accessories)) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. // oh my god kys whoever made this if statement jfc :gun: for(var/obj/item/clothing/accessory/A in w_uniform.accessories) var/tie_icon = A.worn_icon || listgetindex(A.sprite_sheets, dna.species.sprite_sheet_name) || 'icons/mob/accessories.dmi' - var/tie_color = A.item_color || A.icon_state + var/tie_color = A.worn_icon_state || A.icon_state standing.overlays += image(tie_icon, tie_color) overlays_standing[UNIFORM_LAYER] = standing diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index cde39430962..f3e1cb79e6b 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -3,7 +3,6 @@ desc = "It looks like it was tailored for a monkey." icon_state = "punpun" worn_icon = 'icons/mob/clothing/under/misc.dmi' - item_color = "punpun" species_restricted = list("Monkey") species_exception = list(/datum/species/monkey) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm index 1f2951a4b7a..697e3cdecca 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm @@ -263,7 +263,6 @@ desc = "A cloak which lts you travel through a perfect reflection of the world." icon = 'icons/obj/lavaland/elite_trophies.dmi' icon_state = "herald_cloak" - item_color = "herald_cloak" actions_types = list(/datum/action/item_action/herald) /obj/item/clothing/neck/cloak/herald_cloak/item_action_slot_check(slot) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm index 1e81928547a..4a2b362ee6b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm @@ -207,7 +207,6 @@ desc = "Found at the bottom of Pandora. After all the evil was released, this was the only thing left inside." icon = 'icons/obj/lavaland/elite_trophies.dmi' icon_state = "hope" - item_color = "hope" allow_duplicates = FALSE resistance_flags = FIRE_PROOF diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index f8d0a231e24..ef9f00a9781 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -7,7 +7,6 @@ w_class = WEIGHT_CLASS_TINY throw_speed = 3 materials = list(MAT_METAL=60) - item_color = "cargo" pressure_resistance = 2 attack_verb = list("stamped") /// What color will this crayon dye clothes, cables, etc? used for for updateIcon purposes on other objs @@ -21,7 +20,6 @@ /obj/item/stamp/qm name = "Quartermaster's rubber stamp" icon_state = "stamp-qm" - item_color = "qm" dye_color = DYE_QM /obj/item/stamp/law @@ -32,76 +30,63 @@ /obj/item/stamp/captain name = "captain's rubber stamp" icon_state = "stamp-cap" - item_color = "captain" dye_color = DYE_CAPTAIN /obj/item/stamp/hop name = "head of personnel's rubber stamp" icon_state = "stamp-hop" - item_color = "hop" dye_color = DYE_HOP /obj/item/stamp/hos name = "head of security's rubber stamp" icon_state = "stamp-hos" - item_color = "hosred" dye_color = DYE_HOS /obj/item/stamp/ce name = "chief engineer's rubber stamp" icon_state = "stamp-ce" - item_color = "chief" dye_color = DYE_CE /obj/item/stamp/rd name = "research director's rubber stamp" icon_state = "stamp-rd" - item_color = "director" dye_color = DYE_RD /obj/item/stamp/cmo name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" - item_color = "medical" dye_color = DYE_CMO /obj/item/stamp/granted name = "\improper GRANTED rubber stamp" - item_color = "qm" /obj/item/stamp/denied name = "\improper DENIED rubber stamp" icon_state = "stamp-deny" - item_color = "redcoat" dye_color = DYE_RED /obj/item/stamp/clown name = "clown's rubber stamp" icon_state = "stamp-clown" - item_color = "clown" dye_color = DYE_CLOWN /obj/item/stamp/rep name = "Nanotrasen Representative's rubber stamp" icon_state = "stamp-rep" - item_color = "rep" dye_color = DYE_NTREP /obj/item/stamp/magistrate name = "Magistrate's rubber stamp" icon_state = "stamp-magistrate" - item_color = "rep" dye_color = DYE_LAW /obj/item/stamp/centcom name = "Central Command rubber stamp" icon_state = "stamp-cent" - item_color = "centcom" dye_color = DYE_CENTCOM /obj/item/stamp/syndicate name = "suspicious rubber stamp" icon_state = "stamp-syndicate" - item_color = "syndicate" dye_color = DYE_SYNDICATE diff --git a/code/modules/surgery/organs/subtypes/kidan_organs.dm b/code/modules/surgery/organs/subtypes/kidan_organs.dm index 63b2996cee6..0ea683e7880 100644 --- a/code/modules/surgery/organs/subtypes/kidan_organs.dm +++ b/code/modules/surgery/organs/subtypes/kidan_organs.dm @@ -89,7 +89,7 @@ if(!get_location_accessible(owner, "head")) occlusion++ - if(owner.w_uniform && copytext(owner.w_uniform.item_color,-2) != "_d") //jumpsuit not rolled down + if(owner.w_uniform && !owner.w_uniform.rolled_down) // jumpsuit not rolled down occlusion++ if(owner.wear_suit) occlusion++ diff --git a/docs/coding/quickstart.md b/docs/coding/quickstart.md index 6ee874d1980..f58e76947f3 100644 --- a/docs/coding/quickstart.md +++ b/docs/coding/quickstart.md @@ -403,30 +403,29 @@ slip under the radar. You can start defining the new item once you found the proper file the item should belong to. Depending on the item you will have to write different code (duh). We will take the new jumpsuit as an example again and will put it in the -`miscellaneous` file. +`misc_jumpsuits` file. When defining a new jumpsuit you can easily copy an existing one and change the definition values. We will take the mailman outfit as a template. ```dm -/obj/item/clothing/under/rank/mailman +/obj/item/clothing/under/misc/mailman name = "mailman's jumpsuit" desc = "'Special delivery!'" icon_state = "mailman" inhand_icon_state = "b_suit" - item_color = "mailman" ``` As seen here a jumpsuit has multiple values you can define. The `name` is pretty -straight forward. `desc` is the description of the item. `icon_state` is the -name the sprite has in the DMI file. `inhand_icon_state` is the name of the sprite of -the suit while held in your hands has in the DMI file. `item_color` is the name -of the sprite in the `icons/mob/uniform.dmi` file. This value will indicate what -sprite will be used when a person wears this jumpsuit. (I know `item_color` is a -weird name for this) +straight forward. `desc` is the description of the item. `icon_state` is the name +the sprite has in the `icon` DMI file. `inhand_icon_state` is the name of the +sprite of the suit while held in your hands has in the `lefthand_file` and +`righthand_file` DMI files. You will also have to add worn icon state (when it's +equipped on a mob) to the `worn_icon` DMI file, or, if it's not set, to the +`icons/mob/clothing/under/misc.dmi`. We of course also have to change the path of the newly created object. We'll -name it `/obj/item/clothing/under/rank/tutorial`. This alone will make it so +name it `/obj/item/clothing/under/misc/tutorial`. This alone will make it so that you can spawn the item using admin powers. It will not automagically appear in vendors or such. diff --git a/icons/mob/clothing/head/softcap.dmi b/icons/mob/clothing/head/softcap.dmi index 1dd0f50c76b..38d717d7bc7 100644 Binary files a/icons/mob/clothing/head/softcap.dmi and b/icons/mob/clothing/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/softcap.dmi b/icons/mob/clothing/species/kidan/head/softcap.dmi index 42a454f59ef..c193eb2a301 100644 Binary files a/icons/mob/clothing/species/kidan/head/softcap.dmi and b/icons/mob/clothing/species/kidan/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/vox/head/softcap.dmi b/icons/mob/clothing/species/vox/head/softcap.dmi index 1f8e4048bd6..53baf7be3aa 100644 Binary files a/icons/mob/clothing/species/vox/head/softcap.dmi and b/icons/mob/clothing/species/vox/head/softcap.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 120c55a024e..53ddbb2cb4f 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/obj/clothing/head/softcap.dmi b/icons/obj/clothing/head/softcap.dmi index ea3d454fddb..d3917c0b76e 100644 Binary files a/icons/obj/clothing/head/softcap.dmi and b/icons/obj/clothing/head/softcap.dmi differ diff --git a/icons/obj/clothing/under/color.dmi b/icons/obj/clothing/under/color.dmi index 8b375da0e67..1da385bf096 100644 Binary files a/icons/obj/clothing/under/color.dmi and b/icons/obj/clothing/under/color.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index f87220e36cc..decb222cf38 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ diff --git a/icons/obj/weapons/energy_melee.dmi b/icons/obj/weapons/energy_melee.dmi index 8c8df18f3ec..e8dea9c0848 100644 Binary files a/icons/obj/weapons/energy_melee.dmi and b/icons/obj/weapons/energy_melee.dmi differ diff --git a/paradise.dme b/paradise.dme index 27edbdaafc6..67ff14b803f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -500,8 +500,8 @@ #include "code\datums\ai\basic_mobs\hunting_behavior\find_and_hunt_target.dm" #include "code\datums\ai\basic_mobs\hunting_behavior\find_hunt_target.dm" #include "code\datums\ai\basic_mobs\hunting_behavior\hunt_target.dm" -#include "code\datums\ai\basic_mobs\hunting_behavior\hunting_mouse.dm" #include "code\datums\ai\basic_mobs\hunting_behavior\hunting_corpses.dm" +#include "code\datums\ai\basic_mobs\hunting_behavior\hunting_mouse.dm" #include "code\datums\ai\generic\find_and_set.dm" #include "code\datums\ai\generic\generic_behaviors.dm" #include "code\datums\ai\idle_behaviors\idle_behavior.dm" @@ -2453,27 +2453,27 @@ #include "code\modules\mob\living\taste.dm" #include "code\modules\mob\living\basic\basic_emotes.dm" #include "code\modules\mob\living\basic\basic_mob.dm" -#include "code\modules\mob\living\basic\friendly\crab.dm" -#include "code\modules\mob\living\basic\friendly\diona_nymph.dm" -#include "code\modules\mob\living\basic\friendly\nian_caterpillar.dm" #include "code\modules\mob\living\basic\posessed_object.dm" #include "code\modules\mob\living\basic\farm_animals\chicken.dm" -#include "code\modules\mob\living\basic\farm_animals\goat.dm" -#include "code\modules\mob\living\basic\farm_animals\goose.dm" -#include "code\modules\mob\living\basic\farm_animals\seal.dm" -#include "code\modules\mob\living\basic\farm_animals\turkey.dm" -#include "code\modules\mob\living\basic\farm_animals\udders.dm" #include "code\modules\mob\living\basic\farm_animals\cow.dm" #include "code\modules\mob\living\basic\farm_animals\deer.dm" #include "code\modules\mob\living\basic\farm_animals\deer_ai.dm" +#include "code\modules\mob\living\basic\farm_animals\goat.dm" +#include "code\modules\mob\living\basic\farm_animals\goose.dm" #include "code\modules\mob\living\basic\farm_animals\pig.dm" -#include "code\modules\mob\living\basic\friendly\mouse.dm" +#include "code\modules\mob\living\basic\farm_animals\seal.dm" +#include "code\modules\mob\living\basic\farm_animals\turkey.dm" +#include "code\modules\mob\living\basic\farm_animals\udders.dm" #include "code\modules\mob\living\basic\friendly\basic_pet.dm" #include "code\modules\mob\living\basic\friendly\bunny.dm" #include "code\modules\mob\living\basic\friendly\butterfly.dm" #include "code\modules\mob\living\basic\friendly\cockroach.dm" +#include "code\modules\mob\living\basic\friendly\crab.dm" +#include "code\modules\mob\living\basic\friendly\diona_nymph.dm" #include "code\modules\mob\living\basic\friendly\lightgeist.dm" #include "code\modules\mob\living\basic\friendly\lizard.dm" +#include "code\modules\mob\living\basic\friendly\mouse.dm" +#include "code\modules\mob\living\basic\friendly\nian_caterpillar.dm" #include "code\modules\mob\living\basic\friendly\penguin.dm" #include "code\modules\mob\living\basic\friendly\sloth.dm" #include "code\modules\mob\living\basic\friendly\snake.dm" @@ -2492,9 +2492,9 @@ #include "code\modules\mob\living\basic\hostile\killertomato.dm" #include "code\modules\mob\living\basic\hostile\pirate.dm" #include "code\modules\mob\living\basic\hostile\skeleton_mob.dm" +#include "code\modules\mob\living\basic\hostile\soviet.dm" #include "code\modules\mob\living\basic\hostile\tree.dm" #include "code\modules\mob\living\basic\hostile\viscerator.dm" -#include "code\modules\mob\living\basic\hostile\soviet.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_ai.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_drone.dm" #include "code\modules\mob\living\basic\hostile\alien\alien_mob_hunter.dm" @@ -2523,8 +2523,8 @@ #include "code\modules\mob\living\basic\nether_mobs\faithless.dm" #include "code\modules\mob\living\basic\nether_mobs\migo.dm" #include "code\modules\mob\living\basic\nether_mobs\nether_mobs.dm" -#include "code\modules\mob\living\basic\retaliate\combat_drone.dm" #include "code\modules\mob\living\basic\retaliate\clown.dm" +#include "code\modules\mob\living\basic\retaliate\combat_drone.dm" #include "code\modules\mob\living\basic\retaliate\kangaroo.dm" #include "code\modules\mob\living\brain\brain_death.dm" #include "code\modules\mob\living\brain\brain_emote.dm"